clearly there's a problem
Lot of bug fixes, fixes inheritance
cleanup