Revert "Current working. Ish."

This reverts commit 3602ae4df9c1a6b280207ad38c11b46069a84977.