Add solutions 17-07 - 17-08