diff --git a/Enigma.xcodeproj/project.pbxproj b/Enigma.xcodeproj/project.pbxproj
index b8a7522..a0626ba 100644
--- a/Enigma.xcodeproj/project.pbxproj
+++ b/Enigma.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		C027A7761B5C5ED80021FF3A /* RotorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C027A7741B5C5ED80021FF3A /* RotorViewController.xib */; };
 		C04D337F1B5B3F6100E2888E /* Machine.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04D337E1B5B3F6100E2888E /* Machine.swift */; };
 		C0DA3A911B5AACB300D8D68E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DA3A901B5AACB300D8D68E /* AppDelegate.swift */; };
-		C0DA3A931B5AACB300D8D68E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DA3A921B5AACB300D8D68E /* ViewController.swift */; };
+		C0DA3A931B5AACB300D8D68E /* MachineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DA3A921B5AACB300D8D68E /* MachineViewController.swift */; };
 		C0DA3A961B5AACB300D8D68E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C0DA3A941B5AACB300D8D68E /* Main.storyboard */; };
 		C0DA3A981B5AACB300D8D68E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C0DA3A971B5AACB300D8D68E /* Assets.xcassets */; };
 		C0DA3A9B1B5AACB300D8D68E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C0DA3A991B5AACB300D8D68E /* LaunchScreen.storyboard */; };
@@ -43,7 +43,7 @@
 		C04D337E1B5B3F6100E2888E /* Machine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Machine.swift; sourceTree = "<group>"; };
 		C0DA3A8D1B5AACB300D8D68E /* Enigma.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Enigma.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C0DA3A901B5AACB300D8D68E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		C0DA3A921B5AACB300D8D68E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		C0DA3A921B5AACB300D8D68E /* MachineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MachineViewController.swift; sourceTree = "<group>"; };
 		C0DA3A951B5AACB300D8D68E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		C0DA3A971B5AACB300D8D68E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		C0DA3A9A1B5AACB300D8D68E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -106,7 +106,7 @@
 			isa = PBXGroup;
 			children = (
 				C0DA3A901B5AACB300D8D68E /* AppDelegate.swift */,
-				C0DA3A921B5AACB300D8D68E /* ViewController.swift */,
+				C0DA3A921B5AACB300D8D68E /* MachineViewController.swift */,
 				C0DA3A941B5AACB300D8D68E /* Main.storyboard */,
 				C0DA3A971B5AACB300D8D68E /* Assets.xcassets */,
 				C0DA3A991B5AACB300D8D68E /* LaunchScreen.storyboard */,
@@ -271,7 +271,7 @@
 				C04D337F1B5B3F6100E2888E /* Machine.swift in Sources */,
 				C0DA3ABF1B5AB49200D8D68E /* Components.swift in Sources */,
 				C027A7751B5C5ED80021FF3A /* RotorViewController.swift in Sources */,
-				C0DA3A931B5AACB300D8D68E /* ViewController.swift in Sources */,
+				C0DA3A931B5AACB300D8D68E /* MachineViewController.swift in Sources */,
 				C0DA3A911B5AACB300D8D68E /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Enigma/MachineViewController.swift b/Enigma/MachineViewController.swift
new file mode 100644
index 0000000..06807e6
--- /dev/null
+++ b/Enigma/MachineViewController.swift
@@ -0,0 +1,21 @@
+//
+//  MachineViewController.swift
+//  Enigma
+//
+//  Created by Eryn Wells on 2015-07-18.
+//  Copyright © 2015 Eryn Wells. All rights reserved.
+//
+
+import UIKit
+
+class MachineViewController: UIViewController, UITextFieldDelegate {
+    @IBOutlet weak var inputTextField: UITextField!
+    @IBOutlet weak var outputTextField: UITextField!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+
+    // MARK: - UITextFieldDelegate
+}
+