Refactoring
Now works given a dependency that has already been resolved
v0.5.1