Working on the build process