Revert "Why aint all this shit together already?"

This reverts commit d1282731883392bcd4eb7ffe9b6b7d5ec9a87122.