Revert "Major changes, ready for testing production"

This reverts commit 8b5b4680e1ac27e22cdab26df61fe3c10cd3ac92.
Major changes, Ready for testing in Production