Blocks -> Grid -> Map functions
Finished refactor
Merge branch 'map_refactor'