Work on fixing circular dependencies