Revert "I did some ghetto thing that half works"

This reverts commit df394dca3f02154b8293dc252d924f49df9d1a8f.
Revert "Revert "I did some ghetto thing that half works""

This reverts commit 04f6449c057f32b8661d507c525c2f8ebc1ed8fc.