Lots more work on getting dependencies in the system