WIP on #18 shapes now spread out as per diagram