Revert "Overhaul Pt.2"

This reverts commit 2328cc6528ccb829d296f4cdc351ca8f94de9587.