Inheritance structural start

beginning to merge to a proper inheritance structure