More work on merging the older code over. Now to hookup the prebuild_commands for Xcode.