Jessica's addition of initial GPS code
Fixing merge conflicts