Proper handling of class-types vs instance-types

Huge progress: Scope is finally treated as a proper class