Added ControlPoint, started to work on basic shapes