tweaked the code to remove references to Point2D, which speeds up processing enough to pass the timing tests, but it still fails 6/7 of the memory tests