Final commit before I remove the google API here