Convert all locations to Point2Ds and add Grid to Entity