@Anq, @alberts2, @BillW And anyone else who cares to contribute to this project. I finally got the branch repository up and running on my end, in part to practice how to work with branches. I wanted to review the project and add any insights I can into the mix. I'm not sure how much I will directly apply any efforts to this because I don't want to step on toes. So this is now our place to discuss this subject in all the deepest of depth it can get so that the more generic threads aren't conquered by these discussions which can get detailed. My first observation in a recent compare is this: If we are getting rid of BuildingClass, we shouldn't need a tag for <Building> in the BuildingInfos at all. That's basically what <Type> IS at this point, right? I'll be looking into more here but that's my first 'huh?' moment. I realize some of this might be mostly due to automatic find/replace actions at the moment.