POC/WIP: port to CommonJS