Wrote Point2 and Rectangle types, rewrote Engine type