Changed Map.Entry<Integer, Integer> to Point (should have used this in the first place)