Moved more methods into Quadrilateral class