Revert "Made a ton of changes"

This reverts commit 39c570a27d4ce4c591762cbf5db75392bba778a3.