Added inheritance... I think?...