Revert "seperated this shit..."

This reverts commit 17a8b39cd232c5d104a4b103c325c0632bab6f4a.