Traverse 90% complete, plus tests