Merge branch 'prototype/proof_of_concept'

Merge back to master