Add solutions to the problems 17-18