Shit stuff

Going to revert most of this...
Revert "Shit stuff"

This reverts commit 04411db383e3b7332fe5b85d8edc06875b626e09.