Revert "A lot of Chris's code"

This reverts commit 21f9e28ee0d0474a5b66a71fa398fab9d4da8a5e.