Added a registry for a trait version of inheritance. And some other things I don't even remember anymore..