finished 2 and 3 entirely, one of the tests in 1 is still failing though