Continue the work that has been progressing in the dependency-injection-3 branch with the intention of completing it and merging into main.