Finished implementation of trapezoid map (Untested) and removed double Point class