Merge pull request #1043 from ESwordTheCat/riW3nfAj

Revert Move modifications (will redo later bits by bits)
Use dna2 Clone instead of manually setting the vars.