Updates.

So many updates and tweaks. Added the roboguice library and some dependency injection.