zest upgrade, build wip