working refactoring dependency management still