Moving towards a working build