Revert "Revert "New Build""

This reverts commit f984907e8d493dc9b22cf17327ace2cdb74f158b.