large refactor of map.  Begin to work out how menu widgets will work.