Implemented 'make_map' (WIP)