Almost finished the way the tests intended

I forgot to commit the finished version before I reverted, so some progress got lost. But this is my solution that would actually fit the tests (Idk if Ive actually went through all the test debugging in this version)