--- a/dstep/foundation/NSAppleEventManager.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSAppleEventManager.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,39 +6,58 @@
  */
 module dstep.foundation.NSAppleEventManager;
 
-import dstep.applicationservices.ApplicationServices;
+//import dstep.applicationservices.ApplicationServices;
+import dstep.coreservices.ae.AEDataModel;
 import dstep.foundation.NSAppleEventDescriptor;
 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.NSAppleEventManager_bindings;
 
+struct __NSAppleEventManagerSuspension;
+
 alias __NSAppleEventManagerSuspension* NSAppleEventManagerSuspensionID;
 
 extern (C)
 {
 	extern
 	{
-		const double NSAppleEventTimeOutDefault;
-		const double NSAppleEventTimeOutNone;
+		double NSAppleEventTimeOutDefault;
+		double NSAppleEventTimeOutNone;
 	}
 }
 
-NSString NSAppleEventManagerWillProcessFirstEventNotification;
+private NSString NSAppleEventManagerWillProcessFirstEventNotification_;
 
-static this ()
+NSString NSAppleEventManagerWillProcessFirstEventNotification ()
 {
-	NSAppleEventManagerWillProcessFirstEventNotification = new NSString(bindings.NSAppleEventManagerWillProcessFirstEventNotification);
+	if (NSAppleEventManagerWillProcessFirstEventNotification_)
+		return NSAppleEventManagerWillProcessFirstEventNotification_;
+	
+	return NSAppleEventManagerWillProcessFirstEventNotification_ = new NSString(bindings.NSAppleEventManagerWillProcessFirstEventNotification);
 }
 
 class NSAppleEventManager : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static NSAppleEventManager sharedAppleEventManager ()
 	{
-		return invokeObjcSelfClass!(NSAppleEventManager, "sharedAppleEventManager");
+		return invokeObjcSuperClass!(NSAppleEventManager, "sharedAppleEventManager");
 	}
 
 	void setEventHandler (Object handler, SEL handleEventSelector, uint eventClass, uint eventID)