Finishing all of these here - more-dependency-injection being the last
Finished editing!
Finishing the rest!