Work on dependencies and refactoring how the bootstrapping works to tie in with dependencies