Gave the GPS code a little bit of structure.  Still a WIP but coming along...