Fixed bug in one soln
Halfway through 2.2