Add solutions 17-05 - 17-06