finished 1 and 2 for writeup