Tidied up the movement!
Fixed das movement
Merge branch 'myswamp'