Cleaning up the way motion works, also splitting out a new applet to help in testing