Getting closer with DI support.