diff --git a/utils/rider_location_cache/daemon.py b/utils/rider_location_cache/daemon.py
deleted file mode 100644
index f371720d..00000000
--- a/utils/rider_location_cache/daemon.py
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os, time, atexit
-from signal import SIGTERM 
-
-class Daemon:
-	"""
-	A generic daemon class.
-	
-	Usage: subclass the Daemon class and override the run() method
-	"""
-	def __init__(self, pidfile, stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
-		self.stdin = stdin
-		self.stdout = stdout
-		self.stderr = stderr
-		self.pidfile = pidfile
-	
-	def daemonize(self):
-		"""
-		do the UNIX double-fork magic, see Stevens' "Advanced 
-		Programming in the UNIX Environment" for details (ISBN 0201563177)
-		http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
-		"""
-		try: 
-			pid = os.fork() 
-			if pid > 0:
-				# exit first parent
-				sys.exit(0) 
-		except OSError, e: 
-			sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
-			sys.exit(1)
-	
-		# decouple from parent environment
-		os.chdir("/") 
-		os.setsid() 
-		os.umask(0) 
-	
-		# do second fork
-		try: 
-			pid = os.fork() 
-			if pid > 0:
-				# exit from second parent
-				sys.exit(0) 
-		except OSError, e: 
-			sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
-			sys.exit(1) 
-	
-		# redirect standard file descriptors
-		sys.stdout.flush()
-		sys.stderr.flush()
-		si = file(self.stdin, 'r')
-		so = file(self.stdout, 'a+')
-		se = file(self.stderr, 'a+', 0)
-		os.dup2(si.fileno(), sys.stdin.fileno())
-		os.dup2(so.fileno(), sys.stdout.fileno())
-		os.dup2(se.fileno(), sys.stderr.fileno())
-	
-		# write pidfile
-		atexit.register(self.delpid)
-		pid = str(os.getpid())
-		file(self.pidfile,'w+').write("%s\n" % pid)
-	
-	def delpid(self):
-		os.remove(self.pidfile)
-
-	def start(self):
-		"""
-		Start the daemon
-		"""
-		# Check for a pidfile to see if the daemon already runs
-		try:
-			pf = file(self.pidfile,'r')
-			pid = int(pf.read().strip())
-			pf.close()
-		except IOError:
-			pid = None
-	
-		if pid:
-			message = "pidfile %s already exist. Daemon already running?\n"
-			sys.stderr.write(message % self.pidfile)
-			sys.exit(1)
-		
-		# Start the daemon
-		self.daemonize()
-		self.run()
-
-	def stop(self):
-		"""
-		Stop the daemon
-		"""
-		# Get the pid from the pidfile
-		try:
-			pf = file(self.pidfile,'r')
-			pid = int(pf.read().strip())
-			pf.close()
-		except IOError:
-			pid = None
-	
-		if not pid:
-			message = "pidfile %s does not exist. Daemon not running?\n"
-			sys.stderr.write(message % self.pidfile)
-			return # not an error in a restart
-
-		# Try killing the daemon process	
-		try:
-			while 1:
-				os.kill(pid, SIGTERM)
-				time.sleep(0.1)
-		except OSError, err:
-			err = str(err)
-			if err.find("No such process") > 0:
-				if os.path.exists(self.pidfile):
-					os.remove(self.pidfile)
-			else:
-				print str(err)
-				sys.exit(1)
-
-	def restart(self):
-		"""
-		Restart the daemon
-		"""
-		self.stop()
-		self.start()
-
-	def run(self):
-		"""
-		You should override this method when you subclass Daemon. It will be called after the process has been
-		daemonized by start() or restart().
-		"""
diff --git a/utils/rider_location_cache/daemon.pyc b/utils/rider_location_cache/daemon.pyc
deleted file mode 100644
index 51504185..00000000
Binary files a/utils/rider_location_cache/daemon.pyc and /dev/null differ
diff --git a/utils/rider_location_cache/rider_location_cache.py b/utils/rider_location_cache/rider_location_cache.py
index 504884e3..54a47ddd 100644
--- a/utils/rider_location_cache/rider_location_cache.py
+++ b/utils/rider_location_cache/rider_location_cache.py
@@ -1,7 +1,5 @@
 import paho.mqtt.client as mqtt
 import ssl
-from threading import Thread
-from daemon import Daemon
 import redis
 import time
 import signal
@@ -11,79 +9,61 @@ import json
 
 class RiderLocationCache(object):
 
-    def run(self):
-        client = mqtt.Client()
-
-        client.on_connect = on_connect
-        # client.on_publish = on_publish
-        client.on_message = on_message
-
-        #client.tls_set(
-        #    "/etc/letsencrypt/live/resqaws.jankstudio.com/fullchain.pem", cert_reqs=ssl.CERT_NONE,
-        #    tls_version=ssl.PROTOCOL_TLSv1)
-        #client.tls_set(
-        #    "/root/aws_ssl_keys/fullchain.pem", cert_reqs=ssl.CERT_NONE,
-        #    tls_version=ssl.PROTOCOL_TLSv1)
-        #client.connect("resqaws.jankstudio.com", 8883, 60)
-        client.connect("localhost", 1883, 60)
-
-        #t = Thread(target=getRedis, args=(1,))
-
-        #t.start()
-
-        #signal.signal(signal.SIGINT, sigint_handler)
+    def run(self, client):
+        print "running loop..."
         client.loop_forever()
 
+# TODO: fix this and put these guys back under the class
 def init_subscriptions(client):
-        #print "subscribing to wildcard"
-        client.subscribe('#')
+    print "subscribing to wildcard #"
+    client.subscribe('#')
 
 def on_connect(client, userdata, flags, rc):
-        init_subscriptions(client)
-        #print("Connected with result code "+str(rc))
-        # client.subscribe("$SYS/#")
+    init_subscriptions(client)
+    #print("Connected with result code "+str(rc))
+    # client.subscribe("$SYS/#")
 
 def user_data_set(userdata):
-        conn = redis.StrictRedis(host='localhost', port=6379, db=0)
-        return conn
+    conn = redis.StrictRedis(host='localhost', port=6379, db=0)
+    return conn
 
 def on_publish(client, userdata, mid):
-        pass
+    pass
 
 def on_message(client, userdata, message):
-        redis_conn = user_data_set(userdata)
-        #print("message topic=", message.topic[0:10])
+    redis_conn = user_data_set(userdata)
+    #print("message topic=", message.topic[0:10])
 
-        if message.topic[0:10] != 'motorider_':
-            return
-        #print repr(message)
+    if message.topic[0:10] != 'motorider_':
+        return
+    #print repr(message)
 
-        # check if json decodable
-        res = json.loads(message.payload)
-        #print res
+    # check if json decodable
+    res = json.loads(message.payload)
+    #print res
 
-        # get rider session id
-        sess_id = message.topic[10:]
+    # get rider session id
+    sess_id = message.topic[10:]
 
-        # check if it has event
-        if 'event' not in res:
-            return
+    # check if it has event
+    if 'event' not in res:
+        return
 
-        # check if event is driver_location
-        if res['event'] != 'driver_location':
-            return
+    # check if event is driver_location
+    if res['event'] != 'driver_location':
+        return
 
-        # save the longitude and latitude
-        # get the rider id from sess_id
-        rider_key = "rider.location.%s" % sess_id
-        rider_long = str(res['longitude'])
-        rider_lat = str(res['latitude'])
+    # save the longitude and latitude
+    # get the rider id from sess_id
+    rider_key = "rider.location.%s" % sess_id
+    rider_long = str(res['longitude'])
+    rider_lat = str(res['latitude'])
 
-        # set the location
-        redis_conn.hmset(rider_key, {'longitude': rider_long, 'latitude': rider_lat})
+    # set the location
+    redis_conn.hmset(rider_key, {'longitude': rider_long, 'latitude': rider_lat})
 
-        # update our redis key
-        key = 'location_%s' % sess_id
-        #print "setting %s" % key
-        redis_conn.setex(key, 1600, message.payload)
+    # update our redis key
+    key = 'location_%s' % sess_id
+    #print "setting %s" % key
+    redis_conn.setex(key, 1600, message.payload)
 
diff --git a/utils/rider_location_cache/rider_location_daemon.py b/utils/rider_location_cache/rider_location_daemon.py
deleted file mode 100644
index f56de6a5..00000000
--- a/utils/rider_location_cache/rider_location_daemon.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import time
-from daemon import Daemon
-import rider_location_cache
-
-class RiderLocationDaemon(Daemon):
-    def run(self):
-        rider_location = rider_location_cache.RiderLocationCache()
-        rider_location.run()
-
-if __name__ == "__main__":
-    daemon = RiderLocationDaemon('/tmp/rider_location_daemon.pid')
-    if len(sys.argv) == 2:
-        if 'start' == sys.argv[1]:
-            daemon.start()
-        elif 'stop' == sys.argv[1]:
-            daemon.stop()
-        elif 'restart' == sys.argv[1]:
-            daemon.restart()
-        elif 'foreground' == sys.argv[1]:
-            daemon.run()
-        else:
-            print "Unknown command"
-            sys.exit(2)
-        sys.exit(0)
-    else:
-        print "usage: %s start|stop|restart" % sys.argv[0]
-        sys.exit(2)
diff --git a/utils/rider_location_cache/riderloc.py b/utils/rider_location_cache/riderloc.py
new file mode 100644
index 00000000..26a1a92f
--- /dev/null
+++ b/utils/rider_location_cache/riderloc.py
@@ -0,0 +1,23 @@
+import paho.mqtt.client as mqtt
+import rider_location_cache as rlc
+import ssl
+import logging
+
+
+client = mqtt.Client()
+client.on_connect = rlc.on_connect
+# client.on_publish = on_publish
+client.on_message = rlc.on_message
+
+#client.tls_set(
+#    "/etc/letsencrypt/live/resqaws.jankstudio.com/fullchain.pem", cert_reqs=ssl.CERT_NONE,
+#    tls_version=ssl.PROTOCOL_TLSv1)
+client.tls_set(
+    "/root/aws_ssl_keys/fullchain.pem", cert_reqs=ssl.CERT_NONE,
+    tls_version=ssl.PROTOCOL_TLSv1)
+#client.connect("resqaws.jankstudio.com", 8883, 60)
+client.connect("localhost", 8883, 60)
+
+
+rider_location = rlc.RiderLocationCache()
+rider_location.run(client)
diff --git a/utils/rider_location_cache/riderloc.service b/utils/rider_location_cache/riderloc.service
new file mode 100644
index 00000000..f3d43264
--- /dev/null
+++ b/utils/rider_location_cache/riderloc.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Rider Location Cache Service
+After=mosquitto.service redis.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/python /root/www/resq/utils/rider_location_cache/riderloc.py
+StandardInput=tty-force
+Restart=always
+
+[Install]
+WantedBy=multi-user.target