diff --git a/GormPrefController.h b/GormPrefController.h
new file mode 100644
index 00000000..09af4208
--- /dev/null
+++ b/GormPrefController.h
@@ -0,0 +1,22 @@
+#ifndef INCLUDED_GormPrefController_h
+#define INCLUDED_GormPrefController_h
+
+#include <Foundation/NSObject.h>
+
+#include <AppKit/NSWindowController.h>
+
+@interface GormPrefController : NSWindowController
+{
+  id window;
+  id popup;
+  id prefBox;
+
+  id _generalView;
+  id _headersView;
+}
+
+- (void) popupAction: (id)sender;
+
+@end
+
+#endif
diff --git a/GormPrefController.m b/GormPrefController.m
new file mode 100644
index 00000000..990cd92b
--- /dev/null
+++ b/GormPrefController.m
@@ -0,0 +1,46 @@
+#include "GormPrefController.h"
+#include "GormGeneralPref.h"
+#include "GormHeadersPref.h"
+
+#include <AppKit/NSBox.h>
+#include <AppKit/NSPopUpButton.h>
+#include <AppKit/NSNibLoading.h>
+#include <AppKit/NSWindow.h>
+
+@implementation GormPrefController
+
+- (void) awakeFromNib
+{
+  _generalView = [[GormGeneralPref alloc] init];
+  _headersView = [[GormHeadersPref alloc] init];
+
+  [prefBox setContentView:[_generalView view]];
+
+  [[self window] setFrameUsingName: @"Preferences"];
+  [[self window] setFrameAutosaveName: @"Preferences"];
+}
+
+
+- (void) popupAction: (id)sender
+{
+  if ( sender != popup )
+    return;
+
+  {
+    int tag = [[sender selectedItem] tag];
+    switch(tag)
+      {
+      case 0: 
+	[prefBox setContentView: [_generalView view]];
+	break;	
+      case 1:
+	[prefBox setContentView: [_headersView view]];
+	break;
+      default:
+	NSLog(@"Ouch Default : - (void) popupAction: (id)sender");
+
+      }
+  }
+}
+
+@end