diff --git a/nephology-client.pl b/nephology-client.pl
index 836caff..63a5cdb 100755
--- a/nephology-client.pl
+++ b/nephology-client.pl
@@ -1,39 +1,67 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
+use warnings;
 use LWP;
+use LWP::Simple;
 use Getopt::Long;
 use JSON;
 use Try::Tiny;
 
-my $version = 1;
+my $version = 2;
 my $work_to_do = 1;
 my ($neph_server, $mac_addr) = undef;
+my $check_certificate = 1;
+my $proto = "https://";
 
 # Get command line options
 GetOptions(
     'server|s=s' => \$neph_server,
     'mac|m=s' => \$mac_addr,
+    'check-certificate!' => \$check_certificate,
 );
 
 print "Nephology Client version $version Startup\n\n";
 
 my $Browser = LWP::UserAgent->new;
 $Browser->agent('NephologyCient/' . $version . '(libwww-perl-' . $LWP::VERSION . ')');
+# allow the use of self-signed certificates
+if (!$check_certificate) {
+    $Browser->ssl_opts(verify_hostname => 0, SSL_verify_mode => 0x00);
+}
 
 while ($work_to_do == 1) {
     my $nephology_commands = {};
     print "Getting worklist from $neph_server for $mac_addr\n";
     # Grab the worklist from the Nepology Server
     my $Response = $Browser->get(
-        "http://" . $neph_server . "/nephology/install/" . $mac_addr,
+        $proto . $neph_server . "/install/" . $mac_addr,
         'X-Nephology-Client-Version' => $version,
-	);
+    );
 
-    unless ($Response->is_success) {
-        print "No successful response, waiting for 5min before trying again\n";
-        sleep 300;
-        next;
+    # fallback to HTTP if HTTPS failed
+    if (!$Response->is_success) {
+        print "No valid HTTPS response from $neph_server, falling back to HTTP\n";
+        $proto = "http://";
+        $Response = $Browser->get(
+            $proto . $neph_server . "/install/" . $mac_addr,
+            'X-Nephology-Client-Version' => $version,
+        );
+    }
+
+    if (!$Response->is_success) {
+        if($Response->status_line =~ /^404/) {
+                my $ohai = `ohai`;
+                $Response = $Browser->post(
+                        $proto . $neph_server . "/install/" . $mac_addr,
+                        'Content-Type' => 'application/json; charset=utf-8',
+                        'Content' => $ohai,
+                );
+        } else {
+                print "No successful response, waiting for 5min before trying again\n";
+                sleep 300;
+                next;
+        }
     }
 
     print "Got a response, processing...\n";
@@ -54,22 +82,36 @@
     }
 
     for my $reqhash (@{$nephology_commands->{'runlist'}}) {
-        print "Got command: " . JSON->new->utf8->encode($reqhash) . "\n";
+        print "Got command: " . $reqhash->{'description'} . "\n";
+
+        my $filename = "/tmp/deploy-" . $reqhash->{'id'};
+        my $url = $proto . "$neph_server/install/$mac_addr/" . $reqhash->{'id'};
+
+        if(-e $filename) {
+            system("rm $filename");
+        }
+
+        open(FILE, "+>", $filename);
+        chmod 0755, $filename;
+        my $output = get ($url);
+        print FILE $output;
+
+        system("bash $filename");
     }
 
-    print "End of run. Waiting 10 seconds before continuing.\n";
+    print "End of run. Waiting for 10 seconds before continuing.\n";
     sleep 10;
 }
 
 sub _check_dmidecode {
-	my $ohai = `ohai`;
-	my $json = JSON->new->utf8;
+    my $ohai = `ohai`;
+    my $json = JSON->new->utf8;
 
-	my $href = $json->decode($ohai);
+    my $href = $json->decode($ohai);
 
-	my $result = $href->{'dmi'}->{'system'}->{'product_name'};
-	chomp($result);
-	return $result;
+    my $result = $href->{'dmi'}->{'system'}->{'product_name'};
+    chomp($result);
+    return $result;
 }
 
 exit;