New initial commit of rebuild