Revert "What I have so far..."

This reverts commit 7e7b0d52a1c0c380da2446bdee9f02a5a5a990b0.