Updated to work with movement.h

The code comments at the top are temporary until the header file is proven to work.