Bunch more work - adding stops works, adding trips works, and forward/reverse trips
More work on adding/removing stop and making model/watches work