Initial dist subtree commit
Working my way through bugs, templates now change correctly, still working on delete functionality.