Initial dist subtree commit
updated/w/omodals