WIP:
Updated logic on when to load a dependency