switched to dependency injection.
switched even *more* to dependency injection.