Now I'm done refactoring the GPS