Working units and buildings.

Commiting before creating PMap.