Moving the map to its own special class
Moving the map to its own special class