refactor container class; modularize/namespace the fluff and mix it back in
kill all teh whitespace lines!
move up autoloading