Proper Dependency Resolution

Also pulled mods from master