Getting ready to refactor(?) out swerve code