all of part 1 complete, need to fix warning possibly