merging wip/api-modules