Joined POC and in-development code