MADE IT SORTA WORK
Revert e108b46..ecc8167

This rolls back to commit e108b46011f6d3a5602307a3afde6bd2a34514a1.
Debugging