WIP - updated inheritance issues