wip/jbmgen
