Traits

Separated out traits.