diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh
index 7fdab58..f4e43ce 100755
--- a/bin/cloud-local.sh
+++ b/bin/cloud-local.sh
@@ -193,14 +193,28 @@ function start_first_time {
 function start_cloud {
   # Check ports
   check_ports
-  
+  start_zk
+  start_kafka
+  start_hadoop
+  start_accumulo
+  start_hbase
+}
+
+function start_zk {
   # start zk
   echo "Starting zoo..."
   (cd $CLOUD_HOME ; zkServer.sh start)
+}
 
-  echo "Starting kafka..."
-  $KAFKA_HOME/bin/kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
-  
+function start_kafka {
+  # start kafka
+  if [[ "$kafka_enable" -eq 1 ]]; then
+	echo "Starting kafka..."
+    $KAFKA_HOME/bin/kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
+  fi
+}
+
+function start_hadoop {
   # start hadoop
   echo "Starting hadoop..."
   hadoop-daemon.sh --config $HADOOP_CONF_DIR start namenode
@@ -211,13 +225,17 @@ function start_cloud {
   # Wait for HDFS to exit safemode:
   echo "Waiting for HDFS to exit safemode..."
   hdfs dfsadmin -safemode wait
+}
 
+function start_accumulo {
   if [[ "$acc_enable" -eq 1 ]]; then
     # starting accumulo
     echo "starting accumulo..."
     $ACCUMULO_HOME/bin/start-all.sh
   fi
+}
 
+function start_hbase {
   if [[ "$hbase_enable" -eq 1 ]]; then
     # start hbase
     echo "starting hbase..."
@@ -231,26 +249,43 @@ function start_yarn {
 }
 
 function stop_cloud {
+  stop_kafka
+  stop_accumulo
+  stop_hbase
+  stop_hadoop
+  stop_zk
+}
 
-  echo "Stopping kafka..."
-  $KAFKA_HOME/bin/kafka-server-stop.sh
+function stop_kafka {
+  if [[ "$kafka_enable" -eq 1 ]]; then
+	echo "Stopping kafka..."
+	$KAFKA_HOME/bin/kafka-server-stop.sh
+ fi
+}
 
+function stop_accumulo {
   if [[ "$acc_enable" -eq 1 ]]; then
     echo "Stopping accumulo..."
     $ACCUMULO_HOME/bin/stop-all.sh
   fi
+}
 
+function stop_hbase {
   if [[ "$hbase_enable" -eq 1 ]]; then
     echo "Stopping hbase..."
     ${HBASE_HOME}/bin/stop-hbase.sh
   fi
-  
+}
+
+function stop_hadoop {
   echo "Stopping yarn and dfs..."
   stop_yarn
   $HADOOP_HOME/sbin/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop namenode
   $HADOOP_HOME/sbin/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop secondarynamenode
   $HADOOP_HOME/sbin/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop datanode
- 
+}
+
+function stop_zk {
   echo "Stopping zookeeper..."
   $ZOOKEEPER_HOME/bin/zkServer.sh stop
 }
@@ -283,10 +318,15 @@ function clear_data {
 }
 
 function show_help {
-  echo "Provide 1 command: (init|start|stop|reconfigure|reyarn|clean|help)"
+  echo "Single argument commands: (init|start|stop|reconfigure|reyarn|clean|help)"
+  echo "Other commands to stop/start individual services:"
+  echo "  hadoop (start|stop)"
+  echo "  accumulo (start|stop)"
+  echo "  hbase (start|stop)"
+  echo "  kafka (start|stop)"
 }
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -eq 0 ]; then
   show_help
   exit 1
 fi
@@ -305,6 +345,30 @@ elif [[ $1 == 'start' ]]; then
   echo "Starting cloud..."
   start_cloud
   echo "Cloud Started"
+elif [[ $1 == 'accumulo' ]]; then
+  if [[ $2 == 'start' ]]; then
+	start_accumulo
+  elif [[ $2 == 'stop' ]]; then
+	stop_accumulo
+  fi
+elif [[ $1 == 'hadoop' ]]; then
+  if [[ $2 == 'start' ]]; then
+	start_hadoop
+  elif [[ $2 == 'stop' ]]; then
+	stop_hadoop
+  fi
+elif [[ $1 == 'kafka' ]]; then
+  if [[ $2 == 'start' ]]; then
+	start_kafka
+  elif [[ $2 == 'stop' ]]; then
+	stop_kafka
+  fi
+elif [[ $1 == 'hbase' ]]; then
+  if [[ $2 == 'start' ]]; then
+    start_hbase
+  elif [[ $2 == 'stop' ]]; then
+    stop_hbase
+  fi	
 elif [[ $1 == 'stop' ]]; then
   echo "Stopping Cloud..."
   stop_cloud
diff --git a/conf/cloud-local.conf b/conf/cloud-local.conf
index 6e22abe..81ba287 100644
--- a/conf/cloud-local.conf
+++ b/conf/cloud-local.conf
@@ -44,11 +44,13 @@ if [[ -z "${CL_VERBOSE}" ]]; then
   CL_VERBOSE=0
 fi
 
-# Enable accumulo or hbase - probably best not to run both but it might work
+# Enable accumulo, hbase and/or kafka
+# probably best not to run both accumulo and hbase but it might work
 # 1 = enabled
 # 0 = disabled
 acc_enable=1
 hbase_enable=0
+kafka_enable=1
 
 # accumulo config
 cl_acc_inst_name="local"