Updates to rebuilder... close to working server side.