Dependency traversal changed and made simpler. All tests are passing!