most of part 1 and 2 done