         self.uneditedURL = text
     }
     
-    func loadURL(url:NSURL) {
+    // MARK: Loading
+    
+    internal func loadURL(url:NSURL) {
         webView.loadRequest(NSURLRequest(URL: url))
     }
     
-//MARK: - loadURLObject
     func loadURLObject(urlObject : NSNotification) {
         if let url = urlObject.object as? NSURL {
             loadAlmostURL(url.absoluteString);
         }
     }
     
-    func requestedReload() {
+    private func requestedReload() {
         webView.reload()
     }
-    func clear() {
-        loadURL(NSURL(string: "https://cdn.rawgit.com/JadenGeller/Helium/master/helium_start.html")!)
-    }
-
-    var webView = WKWebView()
-    var shouldRedirect: Bool {
-        get {
-            return !NSUserDefaults.standardUserDefaults().boolForKey(UserSetting.DisabledMagicURLs.userDefaultsKey)
-        }
-    }
+    
+    
+    // MARK: Webview functions
     
     // Redirect Hulu and YouTube to pop-out videos
     func webView(webView: WKWebView, decidePolicyForNavigationAction navigationAction: WKNavigationAction, decisionHandler: (WKNavigationActionPolicy) -> Void) {

            modified = modified.replacePrefix("http://v.youku.com/v_show/id_", replacement: "http://player.youku.com/embed/")
            modified = modified.replacePrefix("http://www.twitch.tv/", replacement: "http://player.twitch.tv?&channel=")
            
        if self.uneditedURL.containsString("https://youtu.be") {
                if urlString.containsString("?t=") {
                    modified = "https://youtube.com/embed/" + getVideoHash(urlString) + makeCustomStartTimeURL(urlString)
                }
            }

            if urlString != modified {
                decisionHandler(WKNavigationActionPolicy.Cancel)
                loadURL(NSURL(string: modified)!)

    
    //Convert a YouTube video url that starts at a certian point to popup/embedded design
    // (i.e. ...?t=1m2s --> ?start=62)
    private func makeCustomStartTimeURL(url: String) -> String {
        let startTime = "?t="
        let idx = url.indexOf(startTime)
        if idx == -1 {
