Added stuff
Consolidate some class loading; replace with autoload
Added some meagre documentation