I hate git
R conflicts
Waypoint syncing working, code cleaned up to make it more understandable