Waypoint editor

Changing the way the waypoint editor works.

When finished this branch should fix #55.