After round 1 of the refactor tractor