Expanded GPSLocation
Cleanup
Large amount of changes to the code and structure