diff --git a/media/iphone/Classes/AddSiteAutocompleteCell.h b/media/iphone/Classes/AddSiteAutocompleteCell.h
new file mode 100644
index 000000000..fc2e34b31
--- /dev/null
+++ b/media/iphone/Classes/AddSiteAutocompleteCell.h
@@ -0,0 +1,21 @@
+//
+//  AddSiteAutocompleteCell.h
+//  NewsBlur
+//
+//  Created by Samuel Clay on 10/12/11.
+//  Copyright 2011 NewsBlur. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AddSiteAutocompleteCell : UITableViewCell {
+    UILabel *feedTitle;
+    UILabel *feedUrl;
+    UILabel *feedSubs;
+}
+
+@property (nonatomic, retain) IBOutlet UILabel *feedTitle;
+@property (nonatomic, retain) IBOutlet UILabel *feedUrl;
+@property (nonatomic, retain) IBOutlet UILabel *feedSubs;
+
+@end
diff --git a/media/iphone/Classes/AddSiteAutocompleteCell.m b/media/iphone/Classes/AddSiteAutocompleteCell.m
new file mode 100644
index 000000000..78edf05b3
--- /dev/null
+++ b/media/iphone/Classes/AddSiteAutocompleteCell.m
@@ -0,0 +1,40 @@
+//
+//  AddSiteAutocompleteCell.m
+//  NewsBlur
+//
+//  Created by Samuel Clay on 10/12/11.
+//  Copyright 2011 NewsBlur. All rights reserved.
+//
+
+#import "AddSiteAutocompleteCell.h"
+
+@implementation AddSiteAutocompleteCell
+
+@synthesize feedTitle;
+@synthesize feedUrl;
+@synthesize feedSubs;
+
+- (id)initWithStyle:(UITableViewCellStyle)style 
+    reuseIdentifier:(NSString *)reuseIdentifier {
+    if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
+        // Initialization code
+    }
+    return self;
+}
+
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    
+    [super setSelected:selected animated:animated];
+}
+
+
+- (void)dealloc {
+    [feedTitle release];
+    [feedUrl release];
+    [feedSubs release];
+    [super dealloc];
+}
+
+
+@end
diff --git a/media/iphone/Classes/AddSiteAutocompleteCell.xib b/media/iphone/Classes/AddSiteAutocompleteCell.xib
new file mode 100644
index 000000000..90217be79
--- /dev/null
+++ b/media/iphone/Classes/AddSiteAutocompleteCell.xib
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1056</int>
+		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">534</string>
+		</object>
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>IBProxyObject</string>
+			<string>IBUILabel</string>
+			<string>IBUITableViewCell</string>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<reference key="dict.values" ref="0"/>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUITableViewCell" id="576926515">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBUIView" id="593350051">
+						<reference key="NSNextResponder" ref="576926515"/>
+						<int key="NSvFlags">256</int>
+						<object class="NSMutableArray" key="NSSubviews">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBUILabel" id="142638324">
+								<reference key="NSNextResponder" ref="593350051"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{20, 3}, {194, 21}}</string>
+								<reference key="NSSuperview" ref="593350051"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="234066169"/>
+								<string key="NSReuseIdentifierKey">_NS:311</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">Daring Fireball</string>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MCAwIDAAA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<float key="IBUIMinimumFontSize">15</float>
+							</object>
+							<object class="IBUILabel" id="234066169">
+								<reference key="NSNextResponder" ref="593350051"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{20, 20}, {280, 21}}</string>
+								<reference key="NSSuperview" ref="593350051"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="459705027"/>
+								<string key="NSReuseIdentifierKey">_NS:311</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">http://daringfireball.net/feeds/extra/parameters/that/might/be/truncated/rss.xml</string>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">12</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<float key="IBUIMinimumFontSize">12</float>
+								<int key="IBUILineBreakMode">5</int>
+							</object>
+							<object class="IBUILabel" id="459705027">
+								<reference key="NSNextResponder" ref="593350051"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{213, 3}, {87, 21}}</string>
+								<reference key="NSSuperview" ref="593350051"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
+								<string key="NSReuseIdentifierKey">_NS:311</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText">123 subscribers</string>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">2</int>
+									<bytes key="NSRGB">MC4xNDUwOTgwNDU1IDAuMTc2NDcwNTkyNiAwLjQyMzUyOTQ0NjEAA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<float key="IBUIMinimumFontSize">11</float>
+								<int key="IBUITextAlignment">2</int>
+							</object>
+						</object>
+						<string key="NSFrameSize">{320, 44}</string>
+						<reference key="NSSuperview" ref="576926515"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="142638324"/>
+						<string key="NSReuseIdentifierKey">_NS:370</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</object>
+				<string key="NSFrameSize">{320, 44}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="593350051"/>
+				<string key="NSReuseIdentifierKey">_NS:358</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MSAxIDEAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<int key="IBUISeparatorStyle">1</int>
+				<reference key="IBUIContentView" ref="593350051"/>
+				<string key="IBUIReuseIdentifier">AddSiteAutocompleteCellIdentifier</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">feedSubs</string>
+						<reference key="source" ref="576926515"/>
+						<reference key="destination" ref="459705027"/>
+					</object>
+					<int key="connectionID">11</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">feedTitle</string>
+						<reference key="source" ref="576926515"/>
+						<reference key="destination" ref="142638324"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">feedUrl</string>
+						<reference key="source" ref="576926515"/>
+						<reference key="destination" ref="234066169"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="576926515"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="142638324"/>
+							<reference ref="459705027"/>
+							<reference ref="234066169"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="142638324"/>
+						<reference key="parent" ref="576926515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="234066169"/>
+						<reference key="parent" ref="576926515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="459705027"/>
+						<reference key="parent" ref="576926515"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.CustomClassName</string>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.CustomClassName</string>
+					<string>-2.IBPluginDependency</string>
+					<string>4.CustomClassName</string>
+					<string>4.IBPluginDependency</string>
+					<string>5.IBPluginDependency</string>
+					<string>6.IBPluginDependency</string>
+					<string>7.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>AddSiteAutocompleteCell</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>UIResponder</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>AddSiteAutocompleteCell</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<reference key="dict.values" ref="0"/>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<reference key="dict.values" ref="0"/>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">13</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AddSiteAutocompleteCell</string>
+					<string key="superclassName">UITableViewCell</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>feedSubs</string>
+							<string>feedTitle</string>
+							<string>feedUrl</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UILabel</string>
+							<string>UILabel</string>
+							<string>UILabel</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>feedSubs</string>
+							<string>feedTitle</string>
+							<string>feedUrl</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedSubs</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedTitle</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedUrl</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AddSiteAutocompleteCell.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">534</string>
+	</data>
+</archive>
diff --git a/media/iphone/Classes/AddViewController.h b/media/iphone/Classes/AddViewController.h
index 9b33b97be..424970a14 100644
--- a/media/iphone/Classes/AddViewController.h
+++ b/media/iphone/Classes/AddViewController.h
@@ -19,7 +19,8 @@
     UITextField *inFolderInput;
     UITextField *newFolderInput;
     UITextField *siteAddressInput;
-    NSMutableData * jsonString;
+    NSMutableData *jsonString;
+    NSMutableArray *autocompleteResults;
     
     UIBarButtonItem *addButton;
     UIBarButtonItem *cancelButton;
@@ -28,6 +29,7 @@
     
     UINavigationBar *navBar;
     UIActivityIndicatorView *activityIndicator;
+    UIActivityIndicatorView *siteActivityIndicator;
     UILabel *addingLabel;
     UILabel *errorLabel;
     UISegmentedControl *addTypeControl;
@@ -41,6 +43,7 @@
 
 - (void)reload;
 - (IBAction)addSite;
+- (void)autocompleteSite:(ASIHTTPRequest *)request;
 - (IBAction)addFolder;
 - (IBAction)selectAddTypeSignup;
 - (IBAction)doCancelButton;
@@ -48,6 +51,7 @@
 - (NSString *)extractParentFolder;
 - (void)animateLoop;
 - (void)hideFolderPicker;
+- (IBAction)checkSiteAddress;
 
 @property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate;
 @property (nonatomic, retain) IBOutlet UITextField *inFolderInput;
@@ -59,9 +63,11 @@
 @property (nonatomic, retain) IBOutlet UIPickerView *folderPicker;
 @property (nonatomic, retain) IBOutlet UITableView *siteTable;
 @property (nonatomic, retain) NSMutableData * jsonString;
+@property (nonatomic, retain) NSMutableArray *autocompleteResults;
 
 @property (nonatomic, retain) IBOutlet UINavigationBar *navBar;
 @property (nonatomic, retain) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (nonatomic, retain) IBOutlet UIActivityIndicatorView *siteActivityIndicator;
 @property (nonatomic, retain) IBOutlet UILabel *addingLabel;
 @property (nonatomic, retain) IBOutlet UILabel *errorLabel;
 @property (nonatomic, retain) IBOutlet UISegmentedControl *addTypeControl;
diff --git a/media/iphone/Classes/AddViewController.m b/media/iphone/Classes/AddViewController.m
index 8fb85c9d2..22e4a6ab9 100644
--- a/media/iphone/Classes/AddViewController.m
+++ b/media/iphone/Classes/AddViewController.m
@@ -7,6 +7,7 @@
 //
 
 #import "AddViewController.h"
+#import "AddSiteAutocompleteCell.h"
 #import "NewsBlurAppDelegate.h"
 #import "ASIHTTPRequest.h"
 #import "ASIFormDataRequest.h"
@@ -23,8 +24,10 @@
 @synthesize folderPicker;
 @synthesize siteTable;
 @synthesize jsonString;
+@synthesize autocompleteResults;
 @synthesize navBar;
 @synthesize activityIndicator;
+@synthesize siteActivityIndicator;
 @synthesize addingLabel;
 @synthesize errorLabel;
 @synthesize addTypeControl;
@@ -98,6 +101,7 @@
     [folderPicker release];
     [siteTable release];
     [jsonString release];
+    [autocompleteResults release];
     [navBar release];
     [super dealloc];
 }
@@ -160,6 +164,46 @@
 	return YES;
 }
 
+- (IBAction)checkSiteAddress {
+    NSString *phrase = siteAddressInput.text;
+    int period_loc = [phrase rangeOfString:@"."].location;
+    NSLog(@"phrase: %@ - %d", phrase, period_loc);
+    if (period_loc != NSNotFound) {
+        // URL
+        [siteAddressInput setReturnKeyType:UIReturnKeyDone];
+        [siteAddressInput resignFirstResponder];
+        [siteAddressInput becomeFirstResponder];
+    } else {
+        // Search
+        [siteAddressInput setReturnKeyType:UIReturnKeySearch];
+        [siteAddressInput resignFirstResponder];
+        [siteAddressInput becomeFirstResponder];
+    }
+    
+    
+    [self.siteActivityIndicator startAnimating];
+    [siteAddressInput setLeftView:self.siteActivityIndicator];
+    NSString *urlString = [NSString stringWithFormat:@"http://%@/rss_feeds/feed_autocomplete?term=%@",
+                           NEWSBLUR_URL, phrase];
+    NSURL *url = [NSURL URLWithString:urlString];
+    ASIFormDataRequest *request = [ASIHTTPRequest requestWithURL:url];
+    [request setDelegate:self];
+    [request setDidFinishSelector:@selector(autocompleteSite:)];
+    [request startAsynchronous];
+}
+
+- (void)autocompleteSite:(ASIHTTPRequest *)request {
+    [self.siteActivityIndicator stopAnimating];
+    UIImageView *urlImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"world.png"]];
+    [siteAddressInput setLeftView:urlImage];
+    [urlImage release];
+    NSString *responseString = [request responseString];
+    autocompleteResults = [responseString JSONValue];
+    NSLog(@"%@", autocompleteResults);
+    [siteTable reloadData];
+    [siteTable setHidden:NO];
+}
+
 - (IBAction)addSite {
     [self hideFolderPicker];
     [siteAddressInput resignFirstResponder];
@@ -349,12 +393,33 @@ numberOfRowsInComponent:(NSInteger)component {
 
 
 - (int)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 0;
+    return [autocompleteResults count];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView 
          cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *AddSiteAutocompleteCellIdentifier = @"AddSiteAutocompleteCellIdentifier";
     
+	AddSiteAutocompleteCell *cell = (AddSiteAutocompleteCell *)[tableView dequeueReusableCellWithIdentifier:AddSiteAutocompleteCellIdentifier];
+	if (cell == nil) {
+		NSArray *nib = [[NSBundle mainBundle] loadNibNamed:@"AddSiteAutocompleteCell"
+                                                     owner:self
+                                                   options:nil];
+        for (id oneObject in nib) {
+            if ([oneObject isKindOfClass:[AddSiteAutocompleteCell class]]) {
+                cell = (AddSiteAutocompleteCell *)oneObject;
+            }
+        }
+	}
+    
+    NSDictionary *result = [autocompleteResults objectAtIndex:indexPath.row];
+    int subs = [[result objectForKey:@"num_subscribers"] intValue];
+    cell.feedTitle.text = [result objectForKey:@"label"];
+    cell.feedUrl.text = [result objectForKey:@"value"];
+    cell.feedSubs.text = [NSString stringWithFormat:@"%@ subscriber%@", 
+                          subs, subs == 1 ? @"" : @"s"];
+    
+    return cell;
 }
 
 @end
diff --git a/media/iphone/Classes/AddViewController.xib b/media/iphone/Classes/AddViewController.xib
index ead1fbbd4..76dd22b01 100644
--- a/media/iphone/Classes/AddViewController.xib
+++ b/media/iphone/Classes/AddViewController.xib
@@ -20,6 +20,7 @@
 			<string>IBProxyObject</string>
 			<string>IBUINavigationBar</string>
 			<string>IBUINavigationItem</string>
+			<string>IBUIScrollView</string>
 			<string>IBUIView</string>
 			<string>IBUIImageView</string>
 			<string>IBUITableView</string>
@@ -72,7 +73,7 @@
 						<string key="NSFrame">{{111, 294}, {189, 52}}</string>
 						<reference key="NSSuperview" ref="973185930"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="845365385"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:311</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -129,6 +130,7 @@
 						<string key="NSFrame">{{87, 310}, {20, 20}}</string>
 						<reference key="NSSuperview" ref="973185930"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="30147744"/>
 						<string key="NSReuseIdentifierKey">_NS:824</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -212,7 +214,7 @@
 						<string key="NSFrame">{{0, 244}, {320, 216}}</string>
 						<reference key="NSSuperview" ref="973185930"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="30147744"/>
+						<reference key="NSNextKeyView" ref="845365385"/>
 						<string key="NSReuseIdentifierKey">_NS:624</string>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<bool key="IBUIShowsSelectionIndicator">YES</bool>
@@ -274,7 +276,7 @@
 						<float key="IBUIMinimumFontSize">18</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
 							<int key="IBUIAutocorrectionType">1</int>
-							<int key="IBUIKeyboardType">3</int>
+							<int key="IBUIKeyboardType">7</int>
 							<int key="IBUIReturnKeyType">6</int>
 							<bool key="IBUIEnablesReturnKeyAutomatically">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -287,7 +289,7 @@
 						<string key="NSFrame">{{20, 130}, {280, 31}}</string>
 						<reference key="NSSuperview" ref="973185930"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="919897576"/>
+						<reference key="NSNextKeyView" ref="450177912"/>
 						<string key="NSReuseIdentifierKey">_NS:294</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -314,25 +316,51 @@
 						</object>
 						<int key="IBUIClearButtonMode">1</int>
 					</object>
-					<object class="IBUITableView" id="919897576">
+					<object class="IBUIActivityIndicatorView" id="450177912">
 						<reference key="NSNextResponder" ref="973185930"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, 179}, {320, 281}}</string>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{25, 136}, {20, 20}}</string>
 						<reference key="NSSuperview" ref="973185930"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="292705575"/>
-						<string key="NSReuseIdentifierKey">_NS:392</string>
-						<reference key="IBUIBackgroundColor" ref="346851231"/>
-						<bool key="IBUIClipsSubviews">YES</bool>
+						<reference key="NSNextKeyView" ref="919897576"/>
+						<string key="NSReuseIdentifierKey">_NS:824</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIStyle">2</int>
+					</object>
+					<object class="IBUIScrollView" id="39450128">
+						<reference key="NSNextResponder" ref="973185930"/>
+						<int key="NSvFlags">268</int>
+						<object class="NSMutableArray" key="NSSubviews">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBUITableView" id="919897576">
+								<reference key="NSNextResponder" ref="39450128"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{280, 77}</string>
+								<reference key="NSSuperview" ref="39450128"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="292705575"/>
+								<string key="NSReuseIdentifierKey">_NS:392</string>
+								<reference key="IBUIBackgroundColor" ref="346851231"/>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<bool key="IBUIAlwaysBounceVertical">YES</bool>
+								<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+								<int key="IBUISeparatorStyle">1</int>
+								<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+								<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+								<float key="IBUIRowHeight">44</float>
+								<float key="IBUISectionHeaderHeight">22</float>
+								<float key="IBUISectionFooterHeight">22</float>
+							</object>
+						</object>
+						<string key="NSFrame">{{20, 164}, {280, 77}}</string>
+						<reference key="NSSuperview" ref="973185930"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:174</string>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIAlwaysBounceVertical">YES</bool>
-						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-						<int key="IBUISeparatorStyle">1</int>
-						<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-						<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-						<float key="IBUIRowHeight">44</float>
-						<float key="IBUISectionHeaderHeight">22</float>
-						<float key="IBUISectionFooterHeight">22</float>
 					</object>
 				</object>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
@@ -4935,6 +4963,32 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					</object>
 					<int key="connectionID">58</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">checkSiteAddress</string>
+						<reference key="source" ref="782639577"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">13</int>
+					</object>
+					<int key="connectionID">59</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">checkSiteAddress</string>
+						<reference key="source" ref="782639577"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">18</int>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">siteActivityIndicator</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="450177912"/>
+					</object>
+					<int key="connectionID">62</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -4970,8 +5024,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<reference ref="919711053"/>
 							<reference ref="900763914"/>
 							<reference ref="292705575"/>
-							<reference ref="919897576"/>
 							<reference ref="151912820"/>
+							<reference ref="450177912"/>
+							<reference ref="39450128"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -5045,16 +5100,30 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						<reference key="object" ref="919711053"/>
 						<reference key="parent" ref="973185930"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">49</int>
-						<reference key="object" ref="919897576"/>
-						<reference key="parent" ref="973185930"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
 						<reference key="object" ref="845365385"/>
 						<reference key="parent" ref="973185930"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="450177912"/>
+						<reference key="parent" ref="973185930"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="39450128"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="919897576"/>
+						</object>
+						<reference key="parent" ref="973185930"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">49</int>
+						<reference key="object" ref="919897576"/>
+						<reference key="parent" ref="39450128"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5078,6 +5147,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					<string>48.IBPluginDependency</string>
 					<string>49.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
+					<string>61.IBPluginDependency</string>
+					<string>63.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
@@ -5104,6 +5175,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -5118,7 +5191,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">58</int>
+			<int key="maxID">63</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5132,6 +5205,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addFolder</string>
 							<string>addSite</string>
+							<string>checkSiteAddress</string>
 							<string>doAddButton</string>
 							<string>doCancelButton</string>
 							<string>selectAddTypeSignup</string>
@@ -5143,6 +5217,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -5151,6 +5226,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addFolder</string>
 							<string>addSite</string>
+							<string>checkSiteAddress</string>
 							<string>doAddButton</string>
 							<string>doCancelButton</string>
 							<string>selectAddTypeSignup</string>
@@ -5165,6 +5241,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<string key="name">addSite</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">checkSiteAddress</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">doAddButton</string>
 								<string key="candidateClassName">id</string>
@@ -5197,6 +5277,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string>newFolderInput</string>
 							<string>passwordLabel</string>
 							<string>passwordOptionalLabel</string>
+							<string>siteActivityIndicator</string>
 							<string>siteAddressInput</string>
 							<string>siteTable</string>
 							<string>usernameLabel</string>
@@ -5218,6 +5299,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string>UITextField</string>
 							<string>UILabel</string>
 							<string>UILabel</string>
+							<string>UIActivityIndicatorView</string>
 							<string>UITextField</string>
 							<string>UITableView</string>
 							<string>UILabel</string>
@@ -5242,6 +5324,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string>newFolderInput</string>
 							<string>passwordLabel</string>
 							<string>passwordOptionalLabel</string>
+							<string>siteActivityIndicator</string>
 							<string>siteAddressInput</string>
 							<string>siteTable</string>
 							<string>usernameLabel</string>
@@ -5305,6 +5388,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<string key="name">passwordOptionalLabel</string>
 								<string key="candidateClassName">UILabel</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">siteActivityIndicator</string>
+								<string key="candidateClassName">UIActivityIndicatorView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">siteAddressInput</string>
 								<string key="candidateClassName">UITextField</string>
diff --git a/media/iphone/NewsBlur.xcodeproj/project.pbxproj b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
index 75e21473c..55406e104 100755
--- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj
+++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
@@ -91,6 +91,8 @@
 		FFD5338D143E701400C5555D /* settings_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFD5338C143E701400C5555D /* settings_icon@2x.png */; };
 		FFD53390143E722000C5555D /* network_icon_all.png in Resources */ = {isa = PBXBuildFile; fileRef = FFD5338E143E722000C5555D /* network_icon_all.png */; };
 		FFD53391143E722000C5555D /* network_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FFD5338F143E722000C5555D /* network_icon.png */; };
+		FFD887F01445F1E800385399 /* AddSiteAutocompleteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FFD887EE1445F1E800385399 /* AddSiteAutocompleteCell.m */; };
+		FFD887F11445F1E800385399 /* AddSiteAutocompleteCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFD887EF1445F1E800385399 /* AddSiteAutocompleteCell.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -221,6 +223,9 @@
 		FFD5338C143E701400C5555D /* settings_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings_icon@2x.png"; sourceTree = "<group>"; };
 		FFD5338E143E722000C5555D /* network_icon_all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = network_icon_all.png; sourceTree = "<group>"; };
 		FFD5338F143E722000C5555D /* network_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = network_icon.png; sourceTree = "<group>"; };
+		FFD887ED1445F1E800385399 /* AddSiteAutocompleteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteAutocompleteCell.h; sourceTree = "<group>"; };
+		FFD887EE1445F1E800385399 /* AddSiteAutocompleteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteAutocompleteCell.m; sourceTree = "<group>"; };
+		FFD887EF1445F1E800385399 /* AddSiteAutocompleteCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddSiteAutocompleteCell.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -260,6 +265,9 @@
 				FF5EA47C143B691000B7563D /* AddViewController.h */,
 				FF5EA47D143B691000B7563D /* AddViewController.m */,
 				FF5EA47E143B691000B7563D /* AddViewController.xib */,
+				FFD887ED1445F1E800385399 /* AddSiteAutocompleteCell.h */,
+				FFD887EE1445F1E800385399 /* AddSiteAutocompleteCell.m */,
+				FFD887EF1445F1E800385399 /* AddSiteAutocompleteCell.xib */,
 				787A0CD811CE65330056422D /* FeedDetailViewController.h */,
 				787A0CD911CE65330056422D /* FeedDetailViewController.m */,
 				787A0CDA11CE65330056422D /* FeedDetailViewController.xib */,
@@ -536,6 +544,7 @@
 				FFD5338D143E701400C5555D /* settings_icon@2x.png in Resources */,
 				FFD53390143E722000C5555D /* network_icon_all.png in Resources */,
 				FFD53391143E722000C5555D /* network_icon.png in Resources */,
+				FFD887F11445F1E800385399 /* AddSiteAutocompleteCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -580,6 +589,7 @@
 				FF4BBC1E13F7487A001EBEBD /* TransparentToolbar.m in Sources */,
 				FF56EC7B13F755E40009D8E0 /* MBProgressHUD.m in Sources */,
 				FF5EA47F143B691000B7563D /* AddViewController.m in Sources */,
+				FFD887F01445F1E800385399 /* AddSiteAutocompleteCell.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};