the great refactoring
engine = ChooChoo
fix merge conflict re choochoo