I think this might be better to have in a separate trait?  Thoughts?