starting the refactoring
 still refactoring travel
 pulling away the conditionals
 more refactors
 vectors