Build process getting better...