More work on the build