More work on piqic-ocaml (work in progress)