WIP: more rebuild progress