Getting closer to a working build