Nawqaan 208

Pulled out some of the shared functionality with the map so I could get at it.  Changed a couple things perhaps out of the scope of the task, can change back if unwanted.