Moving towards color layout
Refined shape-maker; added ad-hoc test harness