Refactored the managers some more to make them less dependent.