Should be a working example by now
Fixing broken stuff.