map::grid refactor #4