Achieved inheritance my way.. small refactor