Ian/dev

Merging designated p1 edits to master branch