Problems 1 & 2 done