Finish 2.1 basically except part d