Added move player support (not tested)
Not tested.