Additions to the map and controller classes

Also some test class updates
Update