Functions for the two different movement types.

Added movement test function.