Intermediate commit of a bunch of changes aimed at making composite shapes (e.g. a 2x2 square) decompose into unit squares when added to the shape placement board.