Rename to Leaf, start improving design