Working on second traversal, need to start working against tests