Simplify move storage
Hackity-hack until two player works. Awful but mostly working.