first iteration of new hierarchy

changed code to add of inheritance