Draft marks

Taxonomy upgrade extras: