remove the 'static' references, we must first decide the DI strategy.