Traverse logic almost there