Hopefully properly merged in the movement primitive code at this point