Revert "Code after meeting with BuzzKillington"

This reverts commit 4310a644fa017c276cb9294058600e77cbc65fca.