Subspecies

Fixes issues in:
https://www.pivotaltracker.com/story/show/66931774