simplified organization, cycle working
improved watch
organizing waypoint as part of cli tool