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

This reverts commit d78253019209c9d6b179d6a89f2971cf05b2f1b6.