Buh. Well, didn't expect this change.
It sounds like you guys are pretty much removing the "civilian" category of units entirely, then?
Though I suppose it makes sense as there really isnt much strategy/tactics to the trading and diplomacy right now; slap down the appropriate buildings, drop the right dude on the map, and then ignore them since they arent crazy guys with axes/swords/whatever.