Revert "Revert "Its messy, its horrible but t0lte cannot die!!!""

This reverts commit 4bc979305a6c41634ca4e0c1c95e880db08893b0.