Remove old Class stuff
Fixed object inheritance...again.
Merge branch 'fix_inheritance_again'