Added inheritence to a few more classes