Get everything to compile; basically an extension of the prior merge