Initial commit of updated POC code