Location manager works, but its not MVC
fixed merge conflicts