Restart the rebuild

Makin' some real progress now. :thumbsup: Congrats Steve.