Trait inheritance done
Patches to trait inheritance
Confirmation tests ok