diff --git a/Limelight/Computer.h b/Limelight/Computer.h
index 17fec12..854a3dd 100644
--- a/Limelight/Computer.h
+++ b/Limelight/Computer.h
@@ -14,5 +14,6 @@
 @property BOOL paired;
 
 - (id) initWithHost:(NSNetService*)host;
+- (id) initWithIp:(NSString*)host;
 
 @end
diff --git a/Limelight/Computer.m b/Limelight/Computer.m
index 2d03366..6a7cb22 100644
--- a/Limelight/Computer.m
+++ b/Limelight/Computer.m
@@ -19,4 +19,13 @@
     return self;
 }
 
+- (id) initWithIp:(NSString*)host {
+    self = [super init];
+    
+    self.hostName = host;
+    self.displayName = host;
+    
+    return self;
+}
+
 @end
diff --git a/Limelight/MainFrameViewController.h b/Limelight/MainFrameViewController.h
index 3dcb829..93a70c6 100644
--- a/Limelight/MainFrameViewController.h
+++ b/Limelight/MainFrameViewController.h
@@ -18,8 +18,7 @@
 @property (strong, nonatomic) IBOutlet UIPickerView *StreamConfigs;
 @property (strong, nonatomic) NSArray* streamConfigVals;
 @property (strong, nonatomic) NSArray* hostPickerVals;
-
-- (void) segueIntoStream;
+@property (strong, nonatomic) IBOutlet UITextField *hostTextField;
 
 + (NSString*) getHost;
 
diff --git a/Limelight/MainFrameViewController.m b/Limelight/MainFrameViewController.m
index 726eb43..4d78225 100644
--- a/Limelight/MainFrameViewController.m
+++ b/Limelight/MainFrameViewController.m
@@ -29,6 +29,10 @@ static NSString* host;
 - (void)PairButton:(UIButton *)sender
 {
     NSLog(@"Pair Button Pressed!");
+    if ([self.hostTextField.text length] > 0) {
+        _selectedHost = [[Computer alloc] initWithIp:self.hostTextField.text];
+        NSLog(@"Using custom host: %@", self.hostTextField.text);
+    }
     [CryptoManager generateKeyPairUsingSSl];
     NSString* uniqueId = [CryptoManager getUniqueID];
     NSData* cert = [CryptoManager readCertFromFile];
@@ -65,6 +69,10 @@ static NSString* host;
 - (void)StreamButton:(UIButton *)sender
 {
     NSLog(@"Stream Button Pressed!");
+    if ([self.hostTextField.text length] > 0) {
+        _selectedHost = [[Computer alloc] initWithIp:self.hostTextField.text];
+        NSLog(@"Using custom host: %@", self.hostTextField.text);
+    }
     host = _selectedHost.hostName;
     [self performSegueWithIdentifier:@"createStreamFrame" sender:self];
 }
diff --git a/MainFrame-iPad.storyboard b/MainFrame-iPad.storyboard
index beb2966..18c5087 100644
--- a/MainFrame-iPad.storyboard
+++ b/MainFrame-iPad.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A389" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="wb7-af-jn8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="wb7-af-jn8">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
     <scenes>
         <!--Main Frame View Controller-->
@@ -50,6 +50,11 @@
                                     <action selector="PairButton:" destination="wb7-af-jn8" eventType="touchUpInside" id="Ct1-6m-aYg"/>
                                 </connections>
                             </button>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Geforce Host" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OCq-Pr-kFE">
+                                <rect key="frame" x="374" y="235" width="276" height="30"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
@@ -57,6 +62,7 @@
                     <connections>
                         <outlet property="HostPicker" destination="bJR-sz-8uh" id="pWB-P3-ZJ2"/>
                         <outlet property="StreamConfigs" destination="rnA-uG-hAA" id="LPP-jQ-5eW"/>
+                        <outlet property="hostTextField" destination="OCq-Pr-kFE" id="HS2-KF-inc"/>
                         <segue destination="OIm-0n-i9v" kind="modal" identifier="createStreamFrame" modalPresentationStyle="fullScreen" id="MOD-9A-3Sk"/>
                     </connections>
                 </viewController>
diff --git a/MainFrame-iPhone.storyboard b/MainFrame-iPhone.storyboard
index b00cd4e..8418625 100644
--- a/MainFrame-iPhone.storyboard
+++ b/MainFrame-iPhone.storyboard
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="dgh-JZ-Q7z">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="dgh-JZ-Q7z">
     <dependencies>
-        <deployment defaultVersion="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
     <scenes>
         <!--Main Frame View Controller-->
@@ -52,6 +51,11 @@
                                     <outlet property="delegate" destination="dgh-JZ-Q7z" id="dTy-8g-aj1"/>
                                 </connections>
                             </pickerView>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Geforce Host" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="unc-nO-WPH">
+                                <rect key="frame" x="82" y="193" width="156" height="30"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
@@ -73,6 +77,7 @@
                     <connections>
                         <outlet property="HostPicker" destination="nFR-to-qQs" id="lTE-tT-lYY"/>
                         <outlet property="StreamConfigs" destination="0xb-lk-PHK" id="VxB-Ur-PNy"/>
+                        <outlet property="hostTextField" destination="unc-nO-WPH" id="MbD-KQ-MoG"/>
                         <segue destination="mI3-9F-XwU" kind="modal" identifier="createStreamFrame" id="cPc-eP-un1"/>
                     </connections>
                 </viewController>