Added some more stuff, fixed a bug all tests currently passing