wip/resid-builder
