fix circular dependencies, everything inherits from klass now