Work on getting the dependencies managable.