Waterfront sites

Taxonomy upgrade extras: