I think it might be worth using the cnc-style per-building production instead, and then we won't have to worry about things like primary buildings and such.