Merged Johns interface in.
Finished SM and working on GPS fixes.