Waypoints

Allows for waypoints to be specified, along with the optional optimization
same as above: `lowercase_with_underscores`
also please keep lines length <= 79 characters.