Finish up movement constraint refactor
Clean up default returnSpring
oops