WIP new build system