Shapes

re-cap