diff --git a/qsubClient.pl b/qsubClient.pl
index f38955d..83da9da 100644
--- a/qsubClient.pl
+++ b/qsubClient.pl
@@ -4,9 +4,12 @@
 use warnings;
 
 use Cwd qw/ realpath /;
-use IO::Socket qw/ AF_UNIX SOCK_STREAM /;
+#use IO::Socket qw/ AF_UNIX SOCK_STREAM /;
+use IO::Socket::INET;
 use Path::Class qw/ file /;
 use File::Temp();
+use Cwd;
+use Storable qw/ nfreeze /;
 
 use Getopt::Std;
 my %opt;
@@ -25,30 +28,47 @@ sub HELP_MESSAGE {
 HELP_MESSAGE if $opt{h};
 
 my $args = join " ", @ARGV;
-my $scriptFile = File::Temp->new(TEMPLATE => 'tempXXXXX', DIR => '/home/limr/share/tmp', SUFFIX => '.sge');
-while (<STDIN>) {
-    print $scriptFile $_;
-}
-close $scriptFile;
+my $socketPath = file($opt{s});
+#my $client = IO::Socket->new(
+#Domain => AF_UNIX,
+#Type => SOCK_STREAM,
+#Peer => $socketPath,
+#Timeout => 30,
+#) or die("Can't connect to server socket: $!\n");
+#
+
+my $client = IO::Socket::INET->new(
+    PeerHost => 'localhost',
+    PeerPort => '34383',
+    Proto => 'tcp',
+) or die "Can't connect to server socket: $!\n";
+eval 'END { close $client } 1' or die $@;
 
-my $socketPath = file(realpath($0))->dir()->file('socket');
-my $client = IO::Socket->new(
-    Domain => AF_UNIX,
-    Type => SOCK_STREAM,
-    Peer => $socketPath,
-) or die("Can't connect to server socket $!\n");
 
-print $client $args;
-print $client getcwd();
-print $client $scriptFile->filename;
+#print "Connected to server $socketPath\n";
+#print "Sending server args: $args\n";
+print $client $args . "\n";
+#print "Sending server cwd: " . getcwd() . "\n";
+print $client getcwd() . "\n";
+
+my $scriptFile = File::Temp->new(TEMPLATE => 'tempXXXXX', DIR => '/home/limr/share/tmp', SUFFIX => '.sge', UNLINK => 0);
+chmod 0644, $scriptFile;
+while (my $line = <STDIN>) {
+    print $scriptFile $line;
+}
+close $scriptFile;
+#print "Sending server script: " . $scriptFile->filename . "\n";
+print $client $scriptFile->filename . "\n";
 
-my $exitCode;
+my $exitCode = -1;
 while (<$client>) {
     if (/^Error:/) {
         print STDERR;
         $exitCode = -1;
+        last;
     } elsif (/^Code:/) {
-        ($exitCode) = $_ =~ /Exit: (\d+)/;
+        ($exitCode) = $_ =~ /Code: (\d+)/;
+        last;
     }
 }
 
diff --git a/qsubDaemon.pl b/qsubDaemon.pl
index a07971d..db1977a 100644
--- a/qsubDaemon.pl
+++ b/qsubDaemon.pl
@@ -7,11 +7,10 @@
 use Proc::Daemon;
 use threads;
 use threads::shared;
-use Thread qw/ async /;
-use Thread::Queue;
 use Schedule::DRMAAc qw/ :all /;
 use File::Temp();
-use IO::Socket qw/ AF_UNIX SOCK_STREAM SOMAXCONN/;
+#use IO::Socket qw/ AF_UNIX SOCK_STREAM SOMAXCONN/;
+use IO::Socket::INET;
 use Path::Class qw/ file /;
 use Cwd;
 
@@ -22,74 +21,96 @@
 $SIG{INT} = \&done;
 
 # process job
-my $jobQueue = new Thread::Queue;
-my $thr = async {
-    while (my $clientJob = $jobQueue->dequeue) {
-        my ($client, $jobid) = ($clientJob->[0], $clientJob->[1]);
-        
+sub job_thread {
+    my ($client, $jobid) = @_;
+    my $stat;
+    my $error;
+    my $diagnosis;
+    do {
         # delete jobs of disconnected clients
         unless ($client->connected) {
+            print "Client disconnected, terminating job\n";
             my ($error, $diagnosis) = drmaa_control($jobid, $DRMAA_CONTROL_TERMINATE);
             print "Error: " .drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
         }
+        ($error, my $jobidOut, $stat, my $rusage, $diagnosis) = drmaa_wait($jobid, 20);
+        print $client "Keep Alive\n";
+    } until ($error != $DRMAA_ERRNO_EXIT_TIMEOUT);
+    print $client "Error: " .drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
 
-        my ($error, $jobidOut, $stat, $diagnosis) = drmaa_wait($jobid, 3);
-        if ($error == $DRMAA_ERRNO_EXIT_TIMEOUT) {
-            # tell client job is complete
-            # pull all exit-related codes
-            ($error, my $exitStatus, $diagnosis) = drmaa_wexitstatus($stat);
-            print $client "Error: " .drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
-            ($error, my $aborted, $diagnosis) = drmaa_wifaborted( $stat );
-            print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
-            ($error, $diagnosis) = drmaa_exit();
-            print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
-            }
-            print $client "Code: " . $exitStatus + $aborted + $signaled + $coreDumped;
-        } else {
-            # requeue the job
-            $jobQueue->enqueue($clientJob);
-        }
-    }
+    # tell client job is complete
+    # pull all exit-related codes
+    ($error, my $exitStatus, $diagnosis) = drmaa_wexitstatus($stat);
+    print $client "Error: " .drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
+    ($error, my $aborted, $diagnosis) = drmaa_wifaborted( $stat );
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
+    ($error, my $signaled, $diagnosis ) = drmaa_wifsignaled( $stat );
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
+    ($error, my $coreDumped, $diagnosis ) = drmaa_wcoredump( $stat );
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" if $error;
+
+    print $client "Code: " . ($exitStatus + $aborted + $signaled + $coreDumped);
 };
 
-my $socketPath = file(realpath($0))->dir()->file('socket');
- 
-{
-    my $server = new IO::Socket->new (
-        Domain => AF_UNIX,
-        Type => SOCK_STREAM,
-        Local => $socketPath,
-        Listen => SOMAXCONN,
-    ) or die "Unable to create server soket: $!\n";
-    eval 'END { unlink $socketPath} 1' or die $@;
-
-    my ($error, $diagnosis) = drmaa_init(undef);
-    die drmaa_strerror($error) . "\n" . $diagnosis if $error;
-
-    while (my $client = $socket->accept()) {
-        my $clientArgs = <$clientsocket>;
-        my $clientCwd = <$clientsocket>;
-        my $clientScript = <$clientsocket>;
-
-        my $scriptFile = File::Temp->new(TEMPLATE => 'tempXXXXX', DIR => '/home/limr/share/tmp', SUFFIX => '.sge');
-        print $scriptFile $clientScript;
-        close $scriptFile;
-        
-        ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_REMOTE_COMMAND, $scriptFile->filename);
-        print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and continue if $error;
-
-        ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_NATIVE_SPECIFICATION, $args);
-        print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and continue if $error;
-
-        ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_WD, getcwd());
-        print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and continue if $error;
-
-        ($error, my $jobid, $diagnosis) = drmaa_run_job($jt);
-        print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and continue if $error;
-
-        ($error, $diagnosis) = drmaa_delete_job_template($jt)
-        print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and continue if $error;
-
-        $jobQueue->enqueue([ $client, $jobid ]);
-    }
+#my $socketPath = file($ARGV[0]);
+#my $server = new IO::Socket->new (
+#Domain => AF_UNIX,
+#Type => SOCK_STREAM,
+#Local => $socketPath,
+#Listen => 3000,
+#) or die "Unable to create server socket: $!\n";
+#eval 'END { unlink $socketPath } 1' or die $@;
+
+my $server = IO::Socket::INET->new(
+    LocalHost => 'localhost',
+    LocalPort => '34383',
+    Proto => 'tcp',
+    Listen => 1000,
+    Reuse => 1,
+);
+
+my ($error, $diagnosis) = drmaa_init(undef);
+die drmaa_strerror($error) . "\n" . $diagnosis if $error;
+
+use threads ('yield',
+    'stack_size' => 64*4096,
+    'exit' => 'threads_only',
+    'stringify');
+
+while (my $client = $server->accept()) {
+    print "Client Connected\n";
+    my $clientArgs = <$client>;
+    chomp $clientArgs;
+    print "Client args: $clientArgs\n";
+    my $clientCwd = <$client>;
+    chomp $clientCwd;
+    print "Client wd: $clientCwd\n";
+    my $scriptFile = <$client>;
+    chomp $scriptFile;
+    print "Client script file: $scriptFile\n";
+
+    ($error, my $jt, $diagnosis) = drmaa_allocate_job_template();
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+    
+    ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_REMOTE_COMMAND, "$scriptFile");
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+
+    ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_NATIVE_SPECIFICATION, $clientArgs);
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+
+    ($error, $diagnosis) = drmaa_set_attribute($jt, $DRMAA_WD, $clientCwd . "/");
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+
+    ($error, my $jobid, $diagnosis) = drmaa_run_job($jt);
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+
+    ($error, $diagnosis) = drmaa_delete_job_template($jt);
+    print $client "Error: " . drmaa_strerror($error) . " : " . $diagnosis . "\n" and next if $error;
+
+    unlink $scriptFile;
+
+    async(\&job_thread, $client, $jobid)->detach;
 }
+
+($error, $diagnosis) = drmaa_exit();
+die drmaa_strerror($error) . "\n" . $diagnosis if $error;