Attempting to get the build process working sanely