Commit before changing the Shape class to just taking two points instead of Size, Angle and Position.