Intermediate attempt at pulling in dependencies