Complete rebuild from the ground up due to DI.