Fix order of operations and add forward motion.