All (I hope) interdependencies captured and testing passes