Messing with gov. WIP
Moving map slightly.
Moving location out from user
Clean up