Now dependency injection safe! for the most part.