Began work to re-factor to Google Maps