further work on dependency tool
Merge branch 'dependencies'