Initial proposal to #214