Backup commit

Doing an Yosemite clean install
:D

It's been too long since I last touched this code, it might not even compile :(