Continued refactoring for dev summit; basemap selection part done