Add map/map_object + test (not quite working)