large refactor, stage broken
fix writing to treestore and committing
change test output