Increased default travel distance
Separated classes in prepping for packageification.