Initial dist subtree commit
added more parse functionality