first part of 2-1 done except 2.6 which seems interesting but hard