Revert "Didn't fully commit"

This reverts commit e9f26cfc9149002f8d89e84ce31e31be356a2d6e.
Revert "Broken But Working"

This reverts commit 2683b275d2f216f972391aec6012bd6759c95de2.