Some work on the build