Add trajectory control (initial revision).