Finally getting the build correctly