I think makes some sense in terms of cleaner code, but doesn't help with getting rid of dependencies.