2 and 3

Finished 2 & 3