Rework of the TreeModel. This should finaliy *knock on wood* inconsitency issues.