Added movement support. Not correct, but a work in progress.