Began refactoring tree table to use spans