BFS refactoring, still working on the plumbing