Problems 15, 16 done