Revert "Cleaned up code (DO NOT MODIFY, THIS IS IN PROGRESS)"

This reverts commit 9a3c2c361446429e5ed5ea92ea22462b824239f8.