#1 Started work on fixing inheritance issue.