Reverted my last commit didn't work as intended and needs a lot more work.