Reconcilation now complete.

Also started on classifying buildings by type.