Reworked to make more things pass. Only one left now
All tests pass! Don't touch anything