whisker refactor out of motor