diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
index eb1964c7d..5f8dcda32 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj	
@@ -20,6 +20,7 @@
 		4B366DFC1B5C165A0026627B /* CRT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B366DFA1B5C165A0026627B /* CRT.cpp */; };
 		4B55CE4B1C3B3B0C0093A61B /* CSAtari2600.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B55CE4A1C3B3B0C0093A61B /* CSAtari2600.mm */; };
 		4B55CE4E1C3B3BDA0093A61B /* CSMachine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B55CE4D1C3B3BDA0093A61B /* CSMachine.mm */; };
+		4B55CE541C3B7ABF0093A61B /* CSElectron.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B55CE531C3B7ABF0093A61B /* CSElectron.mm */; };
 		4B92EACA1B7C112B00246143 /* TimingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92EAC91B7C112B00246143 /* TimingTests.swift */; };
 		4BB298EE1B587D8400A49093 /* 6502_functional_test.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E01B587D8300A49093 /* 6502_functional_test.bin */; };
 		4BB298EF1B587D8400A49093 /* AllSuiteA.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4BB297E11B587D8300A49093 /* AllSuiteA.bin */; };
@@ -340,6 +341,8 @@
 		4B55CE4C1C3B3BDA0093A61B /* CSMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSMachine.h; sourceTree = "<group>"; };
 		4B55CE4D1C3B3BDA0093A61B /* CSMachine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CSMachine.mm; sourceTree = "<group>"; };
 		4B55CE4F1C3B78A80093A61B /* CSMachine+Subclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CSMachine+Subclassing.h"; sourceTree = "<group>"; };
+		4B55CE521C3B7ABF0093A61B /* CSElectron.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSElectron.h; sourceTree = "<group>"; };
+		4B55CE531C3B7ABF0093A61B /* CSElectron.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CSElectron.mm; sourceTree = "<group>"; };
 		4B92EAC91B7C112B00246143 /* TimingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimingTests.swift; sourceTree = "<group>"; };
 		4BB297DF1B587D8200A49093 /* Clock SignalTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Clock SignalTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		4BB297E01B587D8300A49093 /* 6502_functional_test.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = 6502_functional_test.bin; sourceTree = "<group>"; };
@@ -710,6 +713,8 @@
 				4B55CE4C1C3B3BDA0093A61B /* CSMachine.h */,
 				4B55CE4D1C3B3BDA0093A61B /* CSMachine.mm */,
 				4B55CE4F1C3B78A80093A61B /* CSMachine+Subclassing.h */,
+				4B55CE521C3B7ABF0093A61B /* CSElectron.h */,
+				4B55CE531C3B7ABF0093A61B /* CSElectron.mm */,
 			);
 			path = Wrappers;
 			sourceTree = "<group>";
@@ -1477,6 +1482,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4B55CE541C3B7ABF0093A61B /* CSElectron.mm in Sources */,
 				4B55CE4B1C3B3B0C0093A61B /* CSAtari2600.mm in Sources */,
 				4B55CE4E1C3B3BDA0093A61B /* CSMachine.mm in Sources */,
 				4B2E2D9D1C3A070400138695 /* Electron.cpp in Sources */,
diff --git a/OSBindings/Mac/Clock Signal/Wrappers/CSAtari2600.h b/OSBindings/Mac/Clock Signal/Wrappers/CSAtari2600.h
index 38dc12c78..05a0b70c3 100644
--- a/OSBindings/Mac/Clock Signal/Wrappers/CSAtari2600.h	
+++ b/OSBindings/Mac/Clock Signal/Wrappers/CSAtari2600.h	
@@ -6,10 +6,8 @@
 //  Copyright © 2015 Thomas Harte. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import "CSCathodeRayView.h"
-#include "Atari2600Inputs.h"
 #include "CSMachine.h"
+#include "Atari2600Inputs.h"
 
 @interface CSAtari2600 : CSMachine
 
diff --git a/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.h b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.h
new file mode 100644
index 000000000..d95b9dd32
--- /dev/null
+++ b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.h	
@@ -0,0 +1,13 @@
+//
+//  CSElectron.h
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/01/2016.
+//  Copyright © 2016 Thomas Harte. All rights reserved.
+//
+
+#include "CSMachine.h"
+
+@interface CSElectron : CSMachine
+
+@end
diff --git a/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm
new file mode 100644
index 000000000..9bd8f32fc
--- /dev/null
+++ b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm	
@@ -0,0 +1,22 @@
+//
+//  CSElectron.m
+//  Clock Signal
+//
+//  Created by Thomas Harte on 04/01/2016.
+//  Copyright © 2016 Thomas Harte. All rights reserved.
+//
+
+#import "CSElectron.h"
+
+#import "Electron.hpp"
+#import "CSMachine+Subclassing.h"
+
+@implementation CSElectron {
+	Electron::Machine _electron;
+}
+
+- (void)doRunForNumberOfCycles:(int)numberOfCycles {
+	_electron.run_for_cycles(numberOfCycles);
+}
+
+@end