Revert "Revert "This stuff""

This reverts commit 92ed2084ca9e5edcfa1878402fefa9629c99e0e4.
Stuff