WIP: working POC -- improve doc in comments