[Matahari] New POC branch...