diff --git a/phytopi/camera/camera.py b/phytopi/camera/camera.py
index 2abd649..dc159a4 100644
--- a/phytopi/camera/camera.py
+++ b/phytopi/camera/camera.py
@@ -8,17 +8,15 @@ import signal
 from enum import Enum
 from phytopi import db, models, app
 
-# map commands
-camera_cmds = {
-    'start_timelapse': 'tl 1',
-    'stop_timelapse': 'tl 0'
-}
+class CameraActionError(Exception):
+    pass
 
 class CameraStatus(Enum):
     STOPPED = 0
     IDLE = 1
     TIMELAPSE = 2
     VIDEO = 3
+    SHOT = 4
 
 class CameraWorker(object):
     def __init__(self, pidfile='/tmp/raspimjpeg.pid', executable='/usr/local/bin/raspimjpeg', fifo='/dev/shm/mjpeg/FIFO', app=None):
@@ -45,7 +43,7 @@ class CameraWorker(object):
             pass
 
         # if not, spawn new process and create pid file
-        self.proc = subprocess.Popen([self.executable])
+        self.proc = subprocess.Popen([self.executable], preexec_fn=os.setsid)
         self.pid = self.proc.pid
         with open(self.pidfile, 'w') as fh:
             fh.write(str(self.pid))
@@ -58,10 +56,16 @@ class CameraWorker(object):
         self.status = CameraStatus.STOPPED
 
     def send_cmd(self, cmd):
-        if cmd in camera_cmds:
-            with open(self.fifo, 'w') as fh:
-                fh.write(cmd)
-            if cmd == camera_cmds['start_timelapse']:
-                self.status = CameraStatus.TIMELAPSE
-            if cmd == camera_cmds['stop_timelapse']:
-                self.status = CameraStatus.IDLE
\ No newline at end of file
+        with open(self.fifo, 'w') as fh:
+            fh.write(cmd)
+
+    def timelapse(self, interval = 0):
+        if self.status == CameraStatus.IDLE:
+            self.send_cmd('tl {}'.format(str(interval)))
+            self.status = CameraStatus.TIMELAPSE
+        elif self.status == CameraStatus.TIMELAPSE:
+            self.send_cmd('tl 0')
+            self.status == CameraStatus.IDLE
+        else:
+            raise CameraActionError('Camera neither idle nor in timelapse mode!')
+            
\ No newline at end of file