Playermovement

Accidentally checked out this from the demo branch instead of master, so I suppose merging to that first might be in order?