More work towards a build machine