Added surface, building, etc tags. Initial merge.