Shifted some more stuff into the base class. Probably need to remove some nasty and unnecessary dependencies.