 //
 
 import Foundation
-import SocketIOClientSwift
+import SocketIO
 
 public final class RemoteControllableApp {
     
     public static let sharedInstance = RemoteControllableApp()
     
-    private var remoteOverlay: UIView?
-    private var socket: SocketIOClient?
-    private var vendorId: String = UIDevice().identifierForVendor!.UUIDString
-    
-    private init() {}
-    
-    public func startConnection(url: String = "localhost:8006", uuid: String = UIDevice().identifierForVendor!.UUIDString) {
+    fileprivate var remoteOverlay: UIView?
+    fileprivate var socket: SocketIOClient?
+    fileprivate var vendorId: String = UIDevice().identifierForVendor!.uuidString
+    
+    fileprivate init() {}
+    
+    public func startConnection(_ url: String = "localhost:8006", uuid: String = UIDevice().identifierForVendor!.uuidString) {
         debugPrint("Remote Connection called at: \(url)")
         vendorId = uuid;
-        socket = SocketIOClient(socketURL: NSURL(string: url)!, options: [.Log(false), .ForcePolling(false)])
+        socket = SocketIOClient(socketURL: URL(string: url)!, config: [.log(true), .forcePolling(true)])
         setupHandlers()
     }
     

}

private class Circle: UIView {
    override func drawRect(rect: CGRect) {
        let path = UIBezierPath(ovalInRect: rect)
        UIColor.blueColor().setFill()
        path.fill()
    }
}

        socket?.connect()
    }
    
    fileprivate func addRemotePresentationOverlay() {
        var window = UIApplication.shared.keyWindow
        if window == nil {
            window = UIApplication.shared.windows.first
        }
        
        if let overlay = remoteOverlay {
