Add TODO for use of new. Should use DI