Get build to work with new version of xcoder - much simplified.