impl/mock controller updated
WaypointTUI and Controllers updated