Added Inheritance

A few database errors still exist