WIP fixed basic location fetching functionality, refactorig & cleaning up