Cool - done on from-shapes branch.