All tests up to 38 working
Got all tests working except for 36, 38, 39, 43