Update Master to Dev on reaching Proof of Concept Milestone

Still lots of work to do