Merge of dev work

Merging my work before more commits to master happen...