Choice now persists, shapes remain on screen

TODO: Constrain Square and Circle
TODO: Ensure they can be drawn in reverse direction
Shapes can now be drawn in any direction

And not just top-left to bottom-right