Clean code.  Add property tree.