add the map, still needs much work