Another intermediate commit, ready to work on the traveler model