Fixed the life cycle of the Google Api Client and Location Updates
Continued with the logic for the Map