refactoring to using behaviors. started with motion.