Definitely more design work to do on dependencies. We'll comment this out with the other TODO.