new base OK, tests running, go merge