--- a/dstep/foundation/NSClassDescription.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSClassDescription.d	Sun Jan 03 22:06:11 2010 +0100
@@ -12,34 +12,83 @@
 import dstep.foundation.NSObject;
 import dstep.foundation.NSString;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+
 
 import bindings = dstep.foundation.NSClassDescription_bindings;
 
-NSString NSClassDescriptionNeededForClassNotification;
+private NSString NSClassDescriptionNeededForClassNotification_;
+
+NSString NSClassDescriptionNeededForClassNotification ()
+{
+	if (NSClassDescriptionNeededForClassNotification_)
+		return NSClassDescriptionNeededForClassNotification_;
+	
+	return NSClassDescriptionNeededForClassNotification_ = new NSString(bindings.NSClassDescriptionNeededForClassNotification);
+}
+
+const TNSClassDescriptionPrimitives = `
 
-static this ()
-{
-	NSClassDescriptionNeededForClassNotification = new NSString(bindings.NSClassDescriptionNeededForClassNotification);
-}
+	NSClassDescription classDescription ()
+	{
+		return invokeObjcSelf!(NSClassDescription, "classDescription");
+	}
+	
+	NSArray attributeKeys ()
+	{
+		return invokeObjcSelf!(NSArray, "attributeKeys");
+	}
+	
+	NSArray toOneRelationshipKeys ()
+	{
+		return invokeObjcSelf!(NSArray, "toOneRelationshipKeys");
+	}
+	
+	NSArray toManyRelationshipKeys ()
+	{
+		return invokeObjcSelf!(NSArray, "toManyRelationshipKeys");
+	}
+	
+	NSString inverseForRelationshipKey (NSString relationshipKey)
+	{
+		return invokeObjcSelf!(NSString, "inverseForRelationshipKey:", NSString)(relationshipKey);
+	}
+	
+	//mixin ObjcBindMethod!(classDescription, "classDescription");
+	//mixin ObjcBindMethod!(attributeKeys, "attributeKeys");
+	//mixin ObjcBindMethod!(toOneRelationshipKeys, "toOneRelationshipKeys");
+	//mixin ObjcBindMethod!(toManyRelationshipKeys, "toManyRelationshipKeys");
+	//mixin ObjcBindMethod!(inverseForRelationshipKey, "inverseForRelationshipKey:");
+`;
 
 class NSClassDescription : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static void registerClassDescription (NSClassDescription description, Class aClass)
 	{
-		return invokeObjcSelfClass!(void, "registerClassDescription:forClass:", NSClassDescription, Class)(description, aClass);
+		return invokeObjcSuperClass!(void, "registerClassDescription:forClass:", NSClassDescription, Class)(description, aClass);
 	}
 
 	static void invalidateClassDescriptionCache ()
 	{
-		return invokeObjcSelfClass!(void, "invalidateClassDescriptionCache");
+		return invokeObjcSuperClass!(void, "invalidateClassDescriptionCache");
 	}
 
 	static NSClassDescription classDescriptionForClass (Class aClass)
 	{
-		return invokeObjcSelfClass!(NSClassDescription, "classDescriptionForClass:", Class)(aClass);
+		return invokeObjcSuperClass!(NSClassDescription, "classDescriptionForClass:", Class)(aClass);
 	}
 
 	NSArray attributeKeys ()
@@ -61,14 +110,4 @@
 	{
 		return invokeObjcSelf!(NSString, "inverseForRelationshipKey:", NSString)(relationshipKey);
 	}
-}
-
-template TNSClassDescriptionPrimitives ()
-{
-	NSClassDescription classDescription ();
-	NSArray attributeKeys ();
-	NSArray toOneRelationshipKeys ();
-	NSArray toManyRelationshipKeys ();
-	NSString inverseForRelationshipKey (NSString relationshipKey);
-}
-
+}
\ No newline at end of file