More progress on state POC