most of part 2 done