And after the great revelation of the last commit...
...lets do everything differently, anyway.