Initial work on rebuild.