Refactored class flow, and use of Android's FusedLocation