Continued progress on python -> ocaml conversion,
 more functionality added