updating to match requirements
move all map stuff into map controller