Adding waypoints

Mostly derp commit before pull