Added the movement stuff

Signed-off-by: Andoni Aguirrezabal <aaguirrezabal@live.com>