OMFG YES!

Finally fixed problem 2.2 so that it works!