Initial fork from CID demo