Fixed move, untested version.
Fixed move again, another untested version.
Move is now functional, but needs testing.