TODOs in Traversal class