Add solution for 1.6
Rework a few previous solutions due to refactoring to make 1.6 easier.