Add solutions to parts 1, 2