Now using class system
Consistent naming in Rect