Dependency resolution *seems* to be working. Needs more testing to be sure.