Oakwood 10/7/2011

Taxonomy upgrade extras: