map::grid refactor part 2.