Revert "Finished majority of changes"

This reverts commit 5ae4892f5b3a86663881fb302b2a04315b304b5a.