Eric dev branch

Attempting merge of my stuff into Master