Revert "Continued updates."

This reverts commit 7b2160fa3f198a64cef252bb07938960ca72d8d0.
Revert "Revert "Continued updates.""

This reverts commit 853bb393baff700a7a77f3d133dce3a22b010389.
Revert "Continued updates."

This reverts commit 7b2160fa3f198a64cef252bb07938960ca72d8d0.
not compiling when trying to add the move function.