'merge' with window-management branch; single frame for now
'merge' with window-management branch; single frame for now

mikedlowis/afm,mikedlowis-prototypes/afm,mikedlowis-prototypes/afm,mikedlowis/afm,mikedlowis/afm,mikedlowis-prototypes/afm