#2 - Fixing the stuff that didnt work
Merge branch '#2'