updated progress, mostly done with prob 1