Added the rest of the build