further work on the map class, build broken