Model now uses Coordinate instead of simple x and y doubles