cc @meso thoughts?