Changed from (x,y) tuples to a Coordinate class with a lot more flexibility