Finish new build system