diff --git a/app/actions/fruxepi.py b/app/actions/fruxepi.py
index cdce2d0..37d916c 100755
--- a/app/actions/fruxepi.py
+++ b/app/actions/fruxepi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #FruxePi - CLI
 
@@ -11,6 +11,11 @@
 import pymysql
 import subprocess
 from time import strftime
+import requests
+import board
+import busio
+import adafruit_ads1x15.ads1015 as ADS
+from adafruit_ads1x15.analog_in import AnalogIn
 
 # Script Arguments
 action = None
@@ -50,152 +55,153 @@
 # CLI Menu Function
 def CLI_menu():
     # Climate
-    if action == "climate":  
+    if action == "climate":
         # Return Temperature
-        if action_option == "-t" and action_GPIO is not None:  
+        if action_option == "-t" and action_GPIO is not None:
             fetchTemperature(action_GPIO)
         # Return Raw Temperature
         elif action_option == "-tr" and action_GPIO is not None:
             fetchRawTemperature(action_GPIO)
-        # Return Humidity    
-        elif action_option == "-h" and action_GPIO is not None: 
-            fetchHumidity(action_GPIO) 
-        # Return Raw Humidity    
-        elif action_option == "-hr" and action_GPIO is not None: 
+        # Return Humidity
+        elif action_option == "-h" and action_GPIO is not None:
+            fetchHumidity(action_GPIO)
+        # Return Raw Humidity
+        elif action_option == "-hr" and action_GPIO is not None:
             fetchRawHumidity(action_GPIO)
         # Diagnostics
-        elif action_option == "-d" and action_GPIO is not None: 
+        elif action_option == "-d" and action_GPIO is not None:
             diagnosticsClimate(action_GPIO)
         else:
             print("Invalid Command!")
 
     # Lights
-    elif action == "lights":  
+    elif action == "lights":
         # Lights ON
-        if action_option == "-ON" and action_GPIO is not None: 
-            lightsON(action_GPIO, action_interval)
+        if action_option == "-ON":
+            lightsON()
         # Lights OFF
-        elif action_option == "-OFF" and action_GPIO is not None:
-            lightsOFF(action_GPIO, action_interval)
-        # Light Relay State    
-        elif action_option == "-s" and action_GPIO is not None:
-            print(getRelayGPIOState(action_GPIO, action_interval)) 
-        # Diagnostics    
-        elif action_option == "-d" and action_GPIO is not None:
+        elif action_option == "-OFF":
+            lightsOFF()
+        # Light Relay State
+        elif action_option == "-s":
+            print(getRelayGPIOState(action_GPIO, action_interval))
+        # Diagnostics
+        elif action_option == "-d":
             relayDiagnostics(action_GPIO, True)
         else:
             print("Invalid Command!")
 
     # Fan
-    elif action == "fan":  
+    elif action == "fan":
         # Fan ON
-        if action_option == "-ON" and action_GPIO is not None: 
+        if action_option == "-ON" and action_GPIO is not None:
             fanON(action_GPIO, action_interval)
         # Fan OFF
         elif action_option == "-OFF" and action_GPIO is not None:
             fanOFF(action_GPIO, action_interval)
-        # Fan Relay State    
+        # Fan Relay State
         elif action_option == "-s" and action_GPIO is not None:
             print(getRelayGPIOState(action_GPIO, action_interval))
-        # Run Fan Program    
+        # Run Fan Program
         elif action_option == "-RUN" and action_GPIO is not None and action_interval is not None and relay_type is not None:
-            fanProgram(action_GPIO, action_interval, relay_type)  
-        # Diagnostics    
+            fanProgram(action_GPIO, action_interval, relay_type)
+        # Diagnostics
         elif action_option == "-d" and action_GPIO is not None:
             relayDiagnostics(action_GPIO, True)
         else:
             print("Invalid Command!")
 
     # Pump
-    elif action == "pump":  
+    elif action == "pump":
         # Pump ON
-        if action_option == "-ON" and action_GPIO is not None: 
-            pumpON(action_GPIO, action_interval)
+        if action_option == "-ON":
+            pumpON()
         # Pump OFF
-        elif action_option == "-OFF" and action_GPIO is not None:
-            pumpOFF(action_GPIO, action_interval)
-        # Pump Relay State    
-        elif action_option == "-s" and action_GPIO is not None:
+        elif action_option == "-OFF":
+            pumpOFF()
+        # Pump Relay State
+        elif action_option == "-s":
             print(getRelayGPIOState(action_GPIO, action_interval))
-        # Run Pump Program    
-        elif action_option == "-RUN" and action_GPIO is not None and action_interval is not None and relay_type is not None:
-            pumpProgram(action_GPIO, action_interval, relay_type)
-        # Diagnostics    
+        # Run Pump Program
+        elif action_option == "-RUN":
+            pumpProgram()
+        # Diagnostics
         elif action_option == "-d" and action_GPIO is not None:
             relayDiagnostics(action_GPIO, True)
         else:
             print("Invalid Command!")
 
     # Moisture
-    elif action == "moisture":  
+    elif action == "moisture":
         # Get Moisture
-        if action_option == "-m" and action_GPIO is not None: 
+        if action_option == "-m" and action_GPIO is not None:
             fetchMoisture(action_GPIO)
         # Pump Moisture Raw
-        elif action_option == "-mr" and action_GPIO is not None: 
-            fetchRawMoisture(action_GPIO)
-        # Moisture State    
+        elif action_option == "-mr" and action_GPIO is not None:
+            fetchRawMoisture()
+        # Moisture State
         elif action_option == "-s" and action_GPIO is not None:
-            getGPIOState(action_GPIO) 
-        # Diagnostics    
+            getGPIOState(action_GPIO)
+        # Diagnostics
         elif action_option == "-d" and action_GPIO is not None:
             diagnosticsMoisture(action_GPIO)
         else:
             print("Invalid Command!")
-    
+
     # Heater
-    elif action == "heater":  
+    elif action == "heater":
         # Heater ON
-        if action_option == "-ON" and action_GPIO is not None: 
+        if action_option == "-ON" and action_GPIO is not None:
             heaterON(action_GPIO)
         # Heater OFF
         elif action_option == "-OFF" and action_GPIO is not None:
             heaterOFF(action_GPIO)
-        # Heater Relay State    
+        # Heater Relay State
         elif action_option == "-s" and action_GPIO is not None:
             print(getGPIOState(action_GPIO))
-        # Run Heater Program    
+        # Run Heater Program
         elif action_option == "-RUN" and action_GPIO is not None and action_interval is not None:
-            heaterProgram(action_GPIO, action_interval)  
-        # Diagnostics    
+            heaterProgram(action_GPIO, action_interval)
+        # Diagnostics
         elif action_option == "-d" and action_GPIO is not None:
             relayDiagnostics(action_GPIO)
         else:
             print("Invalid Command!")
-    
+
     # Fetch Grow Data
-    elif action == "update":  
+    elif action == "update":
         # Update grow data
-        if action_option == "-growdata": 
+        if action_option == "-growdata":
             growData = getGrowData()
             growDataUpdate(growData)
         # Update chart
-        elif action_option == "-chart": 
-            update_chart()
+        elif action_option == "-chart":
+            print("Nope")
         else:
             print("Invalid Command!")
 
     # Maintenance
-    elif action == "maint":  
+    elif action == "maint":
         # Cleanup old data from database
-        if action_option == "-cleanup": 
-            deleteOldGrowData()
+        if action_option == "-cleanup":
+            print("Ignore")
+            # Do nothing because I want historical data
         else:
             print("Invalid Command!")
-    
+
     # Camera
-    elif action == "camera":  
+    elif action == "camera":
         # Capture Photo
-        if action_option == "-capture": 
+        if action_option == "-capture":
             capturePhoto("candid")
         elif action_option == "-crop":
             capturePhoto("crop")
-        # Diagnostics    
+        # Diagnostics
         elif action_option == "-d":
             cameraDiagnostics()
         else:
             print("Invalid Command!")
-    
+
     else:
         print("Invalid Command!")
 
@@ -210,37 +216,34 @@ def fetchMoisture(gpioPIN):
         status = GPIO.input(int(gpioPIN))
 
         if status is not None:
-            
+
             if status == 0:
                 print("Soil Dry")
             elif status == 1:
                 print("Soil Moist")
-                    
+
         else:
             print('Failed to get reading. Try again!')
-            
+
     except:
         print('Sensor Error!')
 
 # Fetch Moisture Raw
-def fetchRawMoisture(gpioPIN):
+def fetchRawMoisture():
     try:
-        # Set our GPIO numbering to BCM
-        GPIO.setmode(GPIO.BCM)
-
-        # Set the GPIO pin to an input
-        GPIO.setup(int(gpioPIN), GPIO.IN)
+        i2c = busio.I2C(board.SCL, board.SDA)
+        ads = ADS.ADS1015(i2c)
+        chan = AnalogIn(ads, ADS.P0)
 
-        # Get Data
-        status = GPIO.input(int(gpioPIN))
+        moisture = int(chan.voltage / 3.85 * 100)
 
-        if status is not None:
-            print(status)
+        if moisture is not None:
+            print(moisture)
+            return moisture
         else:
             print('Failed to get reading. Try again!')
-
     except:
-        print('Sensor Error!')
+        print("Sensor Error!")
 
 def diagnosticsMoisture(gpioPIN):
 
@@ -265,7 +268,7 @@ def diagnosticsMoisture(gpioPIN):
 # Fetch Temperature
 def fetchTemperature(gpioPIN):
     try:
-        humidity,temperature = dht.read_retry(dht.DHT22, int(gpioPIN))
+        humidity,temperature = dht.read_retry(dht.DHT11, int(gpioPIN))
 
         if temperature is not None:
             data_output = str(round(temperature, 2)) + "*C"
@@ -279,7 +282,7 @@ def fetchTemperature(gpioPIN):
 # Fetch Raw Temperature
 def fetchRawTemperature(gpioPIN):
     try:
-        humidity,temperature = dht.read_retry(dht.DHT22, int(gpioPIN))
+        humidity,temperature = dht.read_retry(dht.DHT11, int(gpioPIN))
 
         if temperature is not None:
             data_output = round(temperature, 2)
@@ -293,7 +296,7 @@ def fetchRawTemperature(gpioPIN):
 # Fetch Humidity
 def fetchHumidity(gpioPIN):
     try:
-        humidity,temperature = dht.read_retry(dht.DHT22, int(gpioPIN))
+        humidity,temperature = dht.read_retry(dht.DHT11, int(gpioPIN))
 
         if humidity is not None and humidity <= 100:
             data_output = str(round(humidity, 2)) + "%"
@@ -307,7 +310,7 @@ def fetchHumidity(gpioPIN):
 # Fetch Raw Humidity
 def fetchRawHumidity(gpioPIN):
     try:
-        humidity,temperature = dht.read_retry(dht.DHT22, int(gpioPIN))
+        humidity,temperature = dht.read_retry(dht.DHT11, int(gpioPIN))
 
         if humidity is not None and humidity <= 100:
             data_output = round(humidity, 2)
@@ -322,7 +325,7 @@ def fetchRawHumidity(gpioPIN):
 def diagnosticsClimate(gpioPIN):
 
     try:
-        humidity,temperature = dht.read_retry(dht.DHT22, int(gpioPIN))
+        humidity,temperature = dht.read_retry(dht.DHT11, int(gpioPIN))
 
         raw_temp = int(temperature)
         raw_humidity = int(humidity)
@@ -364,12 +367,12 @@ def fetchFanThresholdDBData():
 
     # Connect to the database
     connection = pymysql.connect(host, user, password, database, charset='utf8mb4', cursorclass=pymysql.cursors.DictCursor)
-    
+
     try:
         with connection.cursor() as cursor:
             # Fetch DB Query
             cursor.execute(sql)
-            result = cursor.fetchall() 
+            result = cursor.fetchall()
     finally:
         connection.close()
 
@@ -377,7 +380,7 @@ def fetchFanThresholdDBData():
     data = {}
     data['temp'] = result[0]['fan_temp_threshold']
     data['humid'] = result[0]['fan_humid_threshold']
-    
+
     return data
 
 
@@ -390,7 +393,7 @@ def checkThresholds(curTemperature, curHumidity):
     # if curTemp or curHumidity exceed threshold
     if curTemperature > float(threshold_data['temp']) or curHumidity > float(threshold_data['humid']):
         return True
-    else: 
+    else:
         return False
 
 
@@ -426,55 +429,35 @@ def heaterProgram(gpioPIN, timeInterval):
     heaterOFF(gpioPIN)
 
 # Lights ON
-def lightsON(gpioPIN, reverseRelay):
+def lightsON():
     print("Lights ON")
-    if reverseRelay:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 0")
-    else:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 1")
+    requests.get('https://maker.ifttt.com/trigger/lights_on/with/key/cR__hYdSLgON9Bs73de0ed')
 
 # Lights OFF
-def lightsOFF(gpioPIN, reverseRelay):
+def lightsOFF():
     print("Lights OFF")
-    if reverseRelay:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 1")
-    else:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 0")
+    requests.get('https://maker.ifttt.com/trigger/lights_off/with/key/cR__hYdSLgON9Bs73de0ed')
 
 # Pump ON
-def pumpON(gpioPIN, reverseRelay):
+def pumpON():
     print("Pump ON")
-    if reverseRelay:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 0")
-    else:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 1")
+    requests.get('https://maker.ifttt.com/trigger/pump_on/with/key/cR__hYdSLgON9Bs73de0ed')
 
 # Pummp OFF
-def pumpOFF(gpioPIN, reverseRelay):
+def pumpOFF():
     print("Pump OFF")
-    if reverseRelay:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 1")
-    else:
-        os.system("gpio -g mode " + str(gpioPIN) + " out")
-        os.system("gpio -g write " + str(gpioPIN) + " 0")
+    requests.get('https://maker.ifttt.com/trigger/pump_off/with/key/cR__hYdSLgON9Bs73de0ed')
 
 # Pump run program
-def pumpProgram(gpioPIN, timeInterval, reverseRelay):
-    pumpON(gpioPIN, reverseRelay)
-    time.sleep(int(timeInterval))
-    pumpOFF(gpioPIN, reverseRelay)
+def pumpProgram():
+    pumpON()
+    time.sleep(20)
+    pumpOFF()
 
 # Get GPIO state
 def getGPIOState(gpioPIN):
     state = os.popen("gpio -g read " + str(gpioPIN)).read()
-    
+
     return state
 
 
@@ -513,12 +496,12 @@ def fetchSensorGPIO():
 
     # Connect to the database
     connection = pymysql.connect(host, user, password, database, charset='utf8mb4', cursorclass=pymysql.cursors.DictCursor)
-    
+
     try:
         with connection.cursor() as cursor:
             # Fetch DB Query
             cursor.execute(sql)
-            result = cursor.fetchall() 
+            result = cursor.fetchall()
     finally:
         connection.close()
 
@@ -529,9 +512,11 @@ def fetchSensorGPIO():
     data['light_GPIO'] = result[2]['gpio_pin']
     data['fan_GPIO'] = result[3]['gpio_pin']
     data['pump_GPIO'] = result[4]['gpio_pin']
-    
+
     return data
 
+
+
 def getGrowData():
 
     GPIO = fetchSensorGPIO()
@@ -542,6 +527,7 @@ def getGrowData():
     data['humidity'] = fetchRawHumidity(GPIO['climate_GPIO'])
     data['light_status'] = getGPIOState(GPIO['light_GPIO'])
     data['moisture_status'] = getGPIOState(GPIO['moisture_GPIO'])
+    data['moisture'] = fetchRawMoisture()
     data['fan_status'] = getGPIOState(GPIO['fan_GPIO'])
     data['pump_status'] = getGPIOState(GPIO['pump_GPIO'])
 
@@ -550,13 +536,13 @@ def getGrowData():
 
 def growDataUpdate(data):
 
-    dbData = [data['timestamp'], data['temperature'], data['humidity'], data['light_status'], data['moisture_status'], data['fan_status'], data['pump_status']]
+    dbData = [data['timestamp'], data['temperature'], data['humidity'], data['light_status'], data['moisture_status'], data['fan_status'], data['pump_status'], data['moisture']]
 
     db = pymysql.connect(host, user, password, database)
     cursor = db.cursor()
 
     try:
-        cursor.execute("INSERT INTO grow_data (date_time, temperature, humidity, light_status, moisture_status, fan_status, pump_status) VALUES(%s, %s, %s, %s, %s, %s, %s)", dbData)        
+        cursor.execute("INSERT INTO grow_data (date_time, temperature, humidity, light_status, moisture_status, fan_status, pump_status, moisture) VALUES(%s, %s, %s, %s, %s, %s, %s, %s)", dbData)
         db.commit()
         print("Grow Data Updated!")
     except:
@@ -572,7 +558,7 @@ def deleteOldGrowData():
 
     # Connect to the database
     connection = pymysql.connect(host, user, password, database, charset='utf8mb4', cursorclass=pymysql.cursors.DictCursor)
-    
+
     try:
         with connection.cursor() as cursor:
             # Fetch DB Query
@@ -590,7 +576,7 @@ def takePhoto(imgPath, imgName):
     filePath = str(imgPath) + str(imgName)
 
     # Take Photo
-    os.system("raspistill -w 1920 -h 1720 -o " + filePath)
+    os.system("fswebcam -r 1920x1080 --no-banner --png 9 " + filePath)
 
     return imgName
 
@@ -601,21 +587,21 @@ def capturePhoto(usage):
 
         if usage == "crop":
             # Image Details
-            imgName = "crop_bg.jpg"
+            imgName = "crop_bg.png"
             imgPath = "/var/www/html/assets/img/"
 
             # Filepath
             filePath = imgPath + imgName
-            
+
             # Take photo
-            os.system("raspistill -w 800 -h 600 -o " + filePath)
+            os.system("fswebcam -r 1920x1080 --no-banner --png 9 " + filePath)
 
         elif usage == "candid":
             # Image Details
             timestamp = "{:%Y%m%d%H%M}".format(datetime.now())
-            imgName = "FruxePi_capture_" + str(timestamp) + ".jpg"
+            imgName = "FruxePi_capture_" + str(timestamp) + ".png"
             imgPath = "/var/www/html/assets/tmp/"
-            
+
             # Take photo
             print(takePhoto(imgPath, imgName))
 
@@ -626,7 +612,7 @@ def capturePhoto(usage):
 
             # Filepath
             filePath = imgPath + imgName
-            
+
             # Take photo
             os.system("raspistill -w 800 -h 600 -o " + filePath)
 
@@ -637,7 +623,7 @@ def capturePhoto(usage):
 def cameraDiagnostics():
     status = os.popen('vcgencmd get_camera').read()
     print(status)
-    
+
 
 # Chart
 # Fetch from sql based on string
@@ -654,48 +640,5 @@ def fetchData(sql):
     finally:
         connection.close()
 
-
-# update chart history function
-def update_history(data):
-
-    # Connect to the database
-    connection = pymysql.connect(host,user,password,database,charset='utf8mb4',cursorclass=pymysql.cursors.DictCursor)
-    
-    try:
-        with connection.cursor() as cursor:
-            # Create a new record
-            sql = "INSERT INTO climate_history (date_time, temperature, humidity) VALUES (%s, %s, %s)"
-            cursor.execute(sql, (data['date_time'], round(data['temperature']), round(data['humidity'])))
-
-        connection.commit()
-        print("Success!")
-    finally:
-        connection.close()
-
-
-def fetch_history():
-
-    tempQueryString = "SELECT AVG(temperature) as temperature, AVG(humidity) as humidity, date_time FROM grow_data WHERE date_time >= now() - interval 1 hour"
-    tempData = fetchData(tempQueryString)
-
-    return tempData
-
-
-# Update Chart
-def update_chart():
-    
-    try:
-        # fetch chart data
-        hourlyData = fetch_history()
-
-        #update chart
-        update_history(hourlyData)
-        
-        print("Chart Updated!")
-    except Exception as e: 
-        print("Chart Update Error!")
-        print(e)
-
-
 # RUN
-CLI_menu()
\ No newline at end of file
+CLI_menu()
diff --git a/app/application/controllers/Dashboard.php b/app/application/controllers/Dashboard.php
old mode 100755
new mode 100644
index 30690a5..ec1a531
--- a/app/application/controllers/Dashboard.php
+++ b/app/application/controllers/Dashboard.php
@@ -1,11 +1,11 @@
-<?php 
+<?php
 	if (!defined('BASEPATH')) exit('No direct script access allowed');
     ob_start();
 	/**
 	* FruxePi (frx-dev-v0.3)
 	* Dashboard Controller
 	*/
-	class Dashboard extends CI_Controller 
+	class Dashboard extends CI_Controller
 	{
 
 		// Constructor
@@ -29,8 +29,8 @@ public function __construct()
 
 		/**
 		* Dashboard - Index
-		* The main page of the FruxePi app. From here, all things are possible! 
-		* 
+		* The main page of the FruxePi app. From here, all things are possible!
+		*
 		* @url /dashboard
 		*/
 		public function index()
@@ -47,11 +47,13 @@ public function index()
 				$data['crops'] = $this->Crop_model->getAllCropsInfo();
 				$data['crop_activity'] = $this->Crop_model->get_cropActivity();
 
-				$data['temperature_chart'] = $this->Dashboard_model->get_temperature_chart_data();
 				$data['temperature_format'] = $this->Climate_model->getTemperatureFormat();
-				$data['humidity_chart'] = $this->Dashboard_model->get_humidity_chart_data();
-				$data['chart_legend'] = $this->Dashboard_model->get_chart_legend();
-				
+
+				$data['temperature_chart7'] = $this->Dashboard_model->get_temperature_chart7_data();
+				$data['humidity_chart7'] = $this->Dashboard_model->get_humidity_chart7_data();
+				$data['moisture_chart7'] = $this->Dashboard_model->get_moisture_chart7_data();
+				$data['chart_legend7'] = $this->Dashboard_model->get_chart_legend7();
+
 				$data['pump_schedule'] = $this->Pump_model->getPumpSchedule();
 				$data['fan_schedule'] = $this->Fan_model->getFanSchedule();
 				$data['fan_status'] = $this->Fan_model->getFanStatus();
@@ -65,9 +67,14 @@ public function index()
 				$data['cropConditions'] = $this->Dashboard_model->get_cropConditions();
 				$data['soil_status'] = $this->Moisture_model->readMoistureSensor();
 
+				$data['temperature_chart'] = $this->Dashboard_model->get_temperature_chart_data();
+				$data['temperature_format'] = $this->Climate_model->getTemperatureFormat();
+				$data['humidity_chart'] = $this->Dashboard_model->get_humidity_chart_data();
+				$data['moisture_chart'] = $this->Dashboard_model->get_moisture_chart_data();
+				$data['chart_legend'] = $this->Dashboard_model->get_chart_legend();
 				// Page View
 				$this->load->view('dashboard/index', $data);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -81,11 +88,11 @@ public function editGrowRoomSettings()
 	    	{
 				// Set climate threshold
 				$this->Climate_model->setClimateThreshold();
-				
+
 				// Change lighting schedule in DB
 				$lightsON = $this->Lights_model->setLightTimerON();
 				$lightsOFF = $this->Lights_model->setLightTimerOFF();
-				
+
 				// Edit lighting CRON
                 $this->Scheduler_model->editLightsCRON($lightsON, $lightsOFF);
 
@@ -94,9 +101,9 @@ public function editGrowRoomSettings()
 
 				// Set Pump schedule
 				$this->Pump_model->setPumpSchedule();
-		
+
 				redirect($_SERVER['HTTP_REFERER']);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -112,7 +119,7 @@ public function latestPhoto()
 				$filename = $this->Camera_model->takePhoto();
 
 				redirect(asset_url() . "tmp/". $filename);
-			
+
 			} else {
 				// Redirect to login.
 				redirect('/login');
@@ -124,7 +131,7 @@ public function reset()
 		{
 			// Page View
 			$this->load->view('auth/reset');
-			
+
 		}
 
 	}
diff --git a/app/application/models/Dashboard_model.php b/app/application/models/Dashboard_model.php
old mode 100755
new mode 100644
index f7cea89..98e227f
--- a/app/application/models/Dashboard_model.php
+++ b/app/application/models/Dashboard_model.php
@@ -21,23 +21,23 @@ public function get_user_info()
 			// Get user ID for current user logged in
 			$user = $this->ion_auth->user()->row();
 			$id = $user->id;
-	
+
 			// Fetch user record from the database
 			$this->db->select('*');
 			$this->db->from('users');
 			$this->db->where(array('users.id' => $id));
-	
+
 			// Return the result as array
 			$query = $this->db->get();
 			return $query->result();
 		}
-		
+
 		// Get latest grow data
 		public function get_latest_grow_data()
 		{
 			$this->db->select("*");
 			$this->db->from("grow_data");
-			$this->db->order_by("id","DESC");
+			$this->db->order_by("id DESC");
 			$this->db->limit(1);
 
 			$query = $this->db->get();
@@ -55,6 +55,7 @@ public function get_latest_grow_data()
 				"moisture_status" => $grow_data["moisture_status"],
 				"fan_status" => $grow_data["fan_status"],
 				"pump_status" => $grow_data["pump_status"],
+				"moisture" => $grow_data["moisture"],
 			);
 
 			return $data;
@@ -76,15 +77,127 @@ public function get_sensor_activation_state()
 			return $data;
 		}
 
+
+		// Get 24-hr temperature chart data
+		public function get_temperature_chart7_data()
+		{
+			$tempFormat = $this->Climate_model->getTemperatureFormat();
+
+			$this->db->select("date_time, round(avg(temperature)) as temperature");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					if ($tempFormat == "F") {
+						$output .= celsiusToFahrenheit($result["temperature"]);
+					} else {
+						$output .= $result["temperature"];
+					}
+				} else {
+					if ($tempFormat == "F") {
+						$output .= celsiusToFahrenheit($result["temperature"]) . ", ";
+					} else {
+						$output .= $result["temperature"] . ", ";
+					}
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get 24-hr humidity chart data
+		public function get_humidity_chart7_data()
+		{
+			$this->db->select("date_time, round(avg(humidity)) as humidity");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["humidity"];
+				} else {
+					$output .= $result["humidity"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get 24-hr moisture chart data
+		public function get_moisture_chart7_data()
+		{
+			$this->db->select("date_time, round(avg(moisture)) as moisture");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["moisture"];
+				} else {
+					$output .= $result["moisture"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
+		// Get chart legend
+		public function get_chart_legend7()
+		{
+			$this->db->select("date_time");
+			$this->db->from("grow_data");
+			$this->db->group_by("day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(7);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= "\"" . date_format(date_create($result["date_time"]), "M d") . "\"";
+				} else {
+					$output .= "\"" . date_format(date_create($result["date_time"]), "M d")  . "\"" . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
 		// Get 24-hr temperature chart data
 		public function get_temperature_chart_data()
 		{
 			$tempFormat = $this->Climate_model->getTemperatureFormat();
 
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time, round(avg(temperature)) as temperature");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -114,10 +227,11 @@ public function get_temperature_chart_data()
 		// Get 24-hr humidity chart data
 		public function get_humidity_chart_data()
 		{
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time, round(avg(humidity)) as humidity");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -136,13 +250,39 @@ public function get_humidity_chart_data()
 			return $output;
 		}
 
+		// Get 24-hr moisture chart data
+		public function get_moisture_chart_data()
+		{
+			$this->db->select("date_time, round(avg(moisture)) as moisture");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
+			$query = $this->db->get();
+			$results = $query->result_array();
+
+			$output = "";
+			$count = 1;
+			foreach($results as $result) {
+				if ($count == count($results)) {
+					$output .= $result["moisture"];
+				} else {
+					$output .= $result["moisture"] . ", ";
+				}
+				$count++;
+			}
+
+			return $output;
+		}
+
 		// Get chart legend
 		public function get_chart_legend()
 		{
-			$this->db->select("*");
-			$this->db->from("climate_history");
-			$this->db->order_by("id","DESC");
-			$this->db->limit(24);
+			$this->db->select("date_time");
+			$this->db->from("grow_data");
+			$this->db->group_by("hour( date_time ), day( date_time )");
+			$this->db->order_by("date_time");
+			$this->db->limit(48);
 
 			$query = $this->db->get();
 			$results = $query->result_array();
@@ -256,8 +396,8 @@ public function get_cropThresholds()
 		// Current Crop Conditions
 		public function get_cropConditions()
 		{
-			
-			$sql = "SELECT * FROM grow_data WHERE DATE(date_time) = CURDATE() ORDER BY date_time DESC";
+
+			$sql = "SELECT * FROM grow_data WHERE DATE(date_time) = CURDATE() ORDER BY date_time ASC";
 			$query = $this->db->query($sql);
 			$tempData = $query->result_array();
 
@@ -271,7 +411,7 @@ public function get_cropConditions()
 			// Loop through tempData
 			$total_records = sizeof($tempData);
 			$positive_records = 0;
-			
+
 			foreach ($tempData as $item) {
 				$temp = $item['temperature'];
 				$humid = $item['humidity'];
@@ -289,7 +429,7 @@ public function get_cropConditions()
 			}
 
 		}
-	
+
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/app/application/models/Lights_model.php b/app/application/models/Lights_model.php
index 45d1219..c514c36 100755
--- a/app/application/models/Lights_model.php
+++ b/app/application/models/Lights_model.php
@@ -68,7 +68,7 @@ public function setGPIO()
 		{
 			// Set GPIO pin value and update database
 			$data = array(
-				"gpio_pin" => $this->input->post('GPIO') 
+				"gpio_pin" => $this->input->post('GPIO')
 			);
 
 			$this->db->where('id', $this->sensorID);
@@ -95,7 +95,7 @@ public function getGPIO()
 
 		/**
 		* Get Lights Activation State
-		* Get the activation state of the lights.  
+		* Get the activation state of the lights.
 		* @return boolean
 		*/
 		public function lightsActivationState()
@@ -108,21 +108,21 @@ public function lightsActivationState()
 			$result = $query->result();
 			$activationState = $result[0]->enabled;
 
-			// Return True or False 
+			// Return True or False
 			return $activationState;
 		}
 
 
 		/**
 		 * Enable Lights
-		 * Enable the light module. 
+		 * Enable the light module.
 		 * @return void
 		 */
 		public function enableLights()
 		{
 			// Set enabled field to TRUE and update database
 			$data = array(
-				"enabled" => TRUE 
+				"enabled" => TRUE
 			);
 
 			$this->db->where('id', $this->sensorID);
@@ -139,7 +139,7 @@ public function disableLights()
 		{
 			// Set enabled field to FALSE and update database
 			$data = array(
-				"enabled" => FALSE 
+				"enabled" => FALSE
 			);
 
 			$this->db->where('id', $this->sensorID);
@@ -155,7 +155,7 @@ public function setRelayType()
 		{
 			// Set relay type value and update database
 			$data = array(
-				"type" => $this->input->post('relayType') 
+				"type" => $this->input->post('relayType')
 			);
 
 			$this->db->where('technical_id', $this->sensorID);
@@ -186,29 +186,22 @@ public function getRelayType()
 		 */
 		public function getLightsStatus()
 		{
-			// GPIO pin
-			$gpioPIN = $this->Lights_model->getGPIO();
-			
-			// Relay Type
-			$relayType = $this->Lights_model->getRelayType();
-
-			// Command string
-			$command_string = "sudo /var/www/html/actions/fruxepi.py lights -s " . $gpioPIN . " " . $relayType;
-			
-			// Execute command
-			exec($command_string, $command_callback);
-			
-			// Return True or False based on $command_callback value
-			if (!empty($command_callback)){
-				if ($command_callback[0] == 1) {
-					return 1;
-				}
+			$current_time = date("H:i:s a");
+			$on = "8 pm";
+			$off = "2 pm";
+			$date_now = DateTime::createFromFormat('H:i a', $current_time);
+			$date_on = DateTime::createFromFormat('H:i a', $on);
+			$date_off = DateTime::createFromFormat('H:i a', $off);
+			if ($date_now > $date_on && $date_now < $date_off)
+			{
+			   return 0;
+			}
+			else
+			{
+				return 1;
 			}
-		
-			return 0;
 		}
 
-
 		/**
 		 * Set Light Timer ON
 		 * Set the ON light timer as HH:MM in 24-hour format.
@@ -218,7 +211,7 @@ public function setLightTimerON()
 		{
 			// Set time for Timer ON
 			$data = array(
-				"lights_ON" => $this->input->post('lightsON')  
+				"lights_ON" => $this->input->post('lightsON')
 			);
 
 			$this->db->where("process_id", "lights");
@@ -237,7 +230,7 @@ public function setLightTimerOFF()
 		{
 			// Set time for Timer ON
 			$data = array(
-				"lights_OFF" => $this->input->post('lightsOFF') 
+				"lights_OFF" => $this->input->post('lightsOFF')
 			);
 
 			$this->db->where("process_id", "lights");
@@ -280,7 +273,7 @@ public function getLightTimerOFF()
 			return $result[0]->lights_OFF;
 		}
 
-		
+
 		/**
 		 * Light Diagnostics
 		 * A diagnostics function to determine the light's health and operability.
@@ -293,7 +286,7 @@ public function lightsDiagnostics()
 
 			// Command string
 			$command_string = "sudo /var/www/html/actions/fruxepi.py lights -d " . $gpioPIN;
-			
+
 			// Execute command
 			$command_callback = shell_exec($command_string);
 
@@ -303,7 +296,7 @@ public function lightsDiagnostics()
 		// Get Light Status
 		public function getLightStatusMessage()
 		{
-		  
+
 		  $data = array();
 		  $timeNow = new DateTime();
 		  $lightsON = new DateTime($this->Lights_model->getLightTimerON());
@@ -311,19 +304,19 @@ public function getLightStatusMessage()
 		  $lightHours = $lightsON->diff($lightsOFF)->format("%h");
 
 		  $light_status = $this->Lights_model->getLightsStatus();
-	
+
 		  if ($light_status == 1)
 			{
 			$interval = $lightsOFF->diff($timeNow);
 			$data['lights'] = 'ON';
 			$data['lightHours'] = $lightHours;
-	
+
 			if ($interval->format("%h") == "0"){
 			  $data['status'] = $interval->format("%i minutes until lights off.");
 			} else {
 			  $data['status'] = $interval->format("%h hours, %i minutes until lights off.");
 			}
-	
+
 		  } else {
 			$interval = $lightsON->diff($timeNow);
 			$data['lights'] = 'OFF';
@@ -334,12 +327,11 @@ public function getLightStatusMessage()
 			  $data['status'] = $interval->format("%h hours, %i minutes until lights on.");
 			}
 		  }
-	
+
 		  return $data;
-	
+
 		}
 
 
 
 	}
-
diff --git a/app/application/views/dashboard/dashboard_scripts.php b/app/application/views/dashboard/dashboard_scripts.php
old mode 100755
new mode 100644
index d5ad5f9..2a204f2
--- a/app/application/views/dashboard/dashboard_scripts.php
+++ b/app/application/views/dashboard/dashboard_scripts.php
@@ -4,8 +4,8 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.min.js"></script>
 
 <script src="<?php echo asset_url(); ?>js/jquery.magnific-popup.min.js"></script>
-<script src="<?php echo asset_url(); ?>js/jquery.timepicker.min.js"></script> 
-<script src="<?php echo asset_url(); ?>js/bootstrap-select.min.js"></script> 
+<script src="<?php echo asset_url(); ?>js/jquery.timepicker.min.js"></script>
+<script src="<?php echo asset_url(); ?>js/bootstrap-select.min.js"></script>
 
 <!-- Page Scripts -->
 <script>
@@ -25,7 +25,7 @@
     });
 
     $(".activity_type").on("mouseleave", function (e) {
-        $('.activity_edit').delay(3000).fadeOut(); 
+        $('.activity_edit').delay(3000).fadeOut();
     });
 
     // Hide show floating activity button on modal pop-up
@@ -36,10 +36,10 @@
     $("#cancelActivityModal").click(function () {
         $("#activityButton").css("visibility", "visible").fadeIn('slow');
     });
-    
+
     // Run functions on load
     $(document).ready(function() {
-       
+
         $('.image-popup-vertical-fit').magnificPopup({
             type: 'image',
             closeOnContentClick: true,
@@ -59,11 +59,40 @@
 
     });
 
+    // Chart Data7
+    var lineChartData7 = {
+        labels: [<?php echo $chart_legend7; ?>],
+        datasets: [{
+            label: 'Temperature (<?php echo $temperature_format; ?>)',
+            borderColor: window.chartColors.red,
+            backgroundColor: window.chartColors.red,
+            fill: false,
+            data: [<?php echo $temperature_chart7; ?>],
+            yAxisID: 'y-axis-1',
+        }, {
+            label: 'Humidity (%)',
+            borderColor: window.chartColors.blue,
+            backgroundColor: window.chartColors.blue,
+            fill: false,
+            data: [<?php echo $humidity_chart7; ?>],
+            yAxisID: 'y-axis-2'
+        },
+        {
+            label: 'Moisture (%)',
+            borderColor: window.chartColors.green,
+            backgroundColor: window.chartColors.green,
+            fill: false,
+            data: [<?php echo $moisture_chart7; ?>],
+            yAxisID: 'y-axis-1'
+        }]
+    };
+
+
     // Chart Data
     var lineChartData = {
         labels: [<?php echo $chart_legend; ?>],
         datasets: [{
-            label: 'Temperature (°<?php echo $temperature_format; ?>)',
+            label: 'Temperature (<?php echo $temperature_format; ?>)',
             borderColor: window.chartColors.red,
             backgroundColor: window.chartColors.red,
             fill: false,
@@ -76,7 +105,15 @@
             fill: false,
             data: [<?php echo $humidity_chart; ?>],
             yAxisID: 'y-axis-2'
+        },
+        {
+            label: 'Moisture (%)',
+            borderColor: window.chartColors.green,
+            backgroundColor: window.chartColors.green,
+            fill: false,
+            data: [<?php echo $moisture_chart; ?>],
+            yAxisID: 'y-axis-1'
         }]
     };
 
-</script>
\ No newline at end of file
+</script>
diff --git a/app/application/views/dashboard/index.php b/app/application/views/dashboard/index.php
old mode 100755
new mode 100644
index 2869afe..b59d748
--- a/app/application/views/dashboard/index.php
+++ b/app/application/views/dashboard/index.php
@@ -1,6 +1,6 @@
 <!-- Header -->
 <?php $this->load->view('core/header'); ?>
-  
+
   <!-- Body - Dashboard Index -->
   <body class="body-index">
 
@@ -20,7 +20,7 @@
             <div class="pull-left h-logo">
                 <h1 onclick="openNav()" style="cursor:pointer;">
                     <img src="<?php echo asset_url(); ?>img/logo-wordmark-sm-rev.svg">
-                </h1>   
+                </h1>
             </div>
         </section>
 
@@ -29,7 +29,7 @@
 
             <?php if ($sensor_state['climate_state'] == 1): ?>
             <div class="row">
-              <div class="col-lg-6 col-6 font-size-50 mb-5 white text-center">
+              <div class="col-lg-4 col-4 font-size-50 mb-5 white text-center">
                 <!-- Temperature: Convert Celsius or Fahrenheit -->
                 <?php if ($temperature_format == "F"): ?>
                   <?php echo round(celsiusToFahrenheit($grow_data['temperature']), 0); ?>&#176;
@@ -39,10 +39,14 @@
                   <span class="font-size-30">C</span>
                 <?php endif; ?>
               </div>
-              <div class="col-lg-6 col-6 font-size-50 mb-5 white text-center">
+              <div class="col-lg-4 col-4 font-size-50 mb-5 white text-center">
                 <?php echo $grow_data['humidity']; ?>
                 <span class="font-size-30">%</span><span class="font-size-16"> rH.</span>
               </div>
+              <div class="col-lg-4 col-4 font-size-50 mb-5 white text-center">
+                <?php echo $grow_data['moisture']; ?>
+                <span class="font-size-30">%</span><span class="font-size-16"> θs.</span>
+              </div>
             </div>
             <?php endif; ?>
 
@@ -68,7 +72,7 @@
 
               <!-- Card -->
               <div class="card shadow" style="width: 100%;">
-                
+
                 <!-- Crop Info -->
                 <div class="card-body">
 
@@ -93,7 +97,7 @@
                   <?php else: ?>
 
                   <div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
-                    
+
                     <!-- Crops Carousel -->
                     <div class="carousel-inner">
                       <?php $counter = 0; ?>
@@ -104,14 +108,14 @@
                         <?php else: ?>
                           <div class="carousel-item">
                         <?php endif; ?>
-                          
-                          
+
+
                           <div class="row">
                             <!-- Crop Nickname -->
                             <div class="col-8">
-                              <h5 class="cropNickname medium-grey"><?php echo $crop['nickname']; ?></h5> 
+                              <h5 class="cropNickname medium-grey"><?php echo $crop['nickname']; ?></h5>
                             </div>
-                            
+
                             <!-- Buttons -->
                             <div class="col-4">
                               <div class="btn-group btn-group-sm float-right" role="group" aria-label="">
@@ -137,7 +141,7 @@
                             <div class="col-12">
                               <!-- Crop Details -->
                               <h5 class="font-size-16 fruxe-grey"><i class="fas fa-leaf pr-3"></i><?php echo $crop['plant_type']; ?><br class="d-md-none d-lg-none d-xl-none"><i class="fas fa-calendar-alt pr-3 pl-3" aria-hidden="true"></i> Day <?php echo $crop['growdays_complete']; ?> / <?php echo $crop['total_growdays']; ?> <span class="font-weight-light text-muted">(<?php echo $crop['crop_progress']; ?>%)</span></h5>
-                              
+
                               <!-- Progress Bar -->
                               <div class="progress mt-3">
                                 <div class="progress-bar progress-bar-striped fruxe-green-bg active" aria-valuenow="<?php echo $crop['crop_progress']; ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $crop['crop_progress']; ?>%" role="progressbar">
@@ -145,7 +149,7 @@
                               </div>
                             </div>
                           </div>
-                            
+
                         </div>
                         <?php $counter++; ?>
                       <?php endforeach; ?>
@@ -159,7 +163,7 @@
 
                 <!-- Tabs -->
                 <div class="card-body p-0">
-                  
+
                   <!-- Tab Navigation -->
                   <nav>
                     <div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist">
@@ -169,9 +173,9 @@
                     </div>
                   </nav>
 
-                  <!-- Tab Content --> 
+                  <!-- Tab Content -->
                   <div class="tab-content p-3" id="nav-tabContent">
-                    
+
                     <!-- Status Tab -->
                     <div class="tab-pane fade show active p-3" id="nav-status" role="tabpanel" aria-labelledby="nav-status-tab">
                       <div class="row">
@@ -179,7 +183,7 @@
                           <h4>Growing Environment</h4>
                         </div>
                         <div class="col-md-3 col-4 settings-dropdown pt-3">
-                          
+
                           <!-- Actions Dropdown -->
                           <div class="btn-group float-right">
                             <button type="button" class="btn dropdown-toggle medium-grey" style="background-color:transparent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog"></i> </button>
@@ -189,18 +193,18 @@
                               <a class="dropdown-item" href="<?php echo base_url("technical/fans"); ?>">Fans</a>
                               <a class="dropdown-item" href="<?php echo base_url("technical/pump"); ?>">Pump</a>
                             </div>
-                          </div>  
+                          </div>
 
                         </div>
                       </div>
-                    
+
 
                       <!-- Grow Room Stats -->
                       <div id="statsDIV" class="row p-3" style="margin-bottom:20px; border-bottom: 1px solid #ccc;">
-                        
+
                         <!-- Temperature -->
                         <?php if ($sensor_state['climate_state'] == 1): ?>
-                        <div id="temp" class="roomStats col-6 col-md-2 col-sm-6 text-left p-0">
+                        <div id="temp" class="roomStats col-4 col-md-2 col-sm-4 text-left p-0">
                           TEMPERATURE
                           <?php if($cropThresholds['temperature'] == "Y"): ?>
                             <i class="fas fa-check-circle light-green mr-2"></i>
@@ -215,17 +219,17 @@
                           <!-- Temperature: Convert Celsius or Fahrenheit -->
                           <div class="font-size-40 medium-grey">
                             <?php if ($temperature_format == "F"): ?>
-                              <?php echo round(celsiusToFahrenheit($grow_data['temperature']), 1); ?>°
+                              <?php echo round(celsiusToFahrenheit($grow_data['temperature']), 1); ?>
                               <span class="font-size-30">F</span>
                             <?php else: ?>
-                              <?php echo round($grow_data['temperature'], 1); ?>°
+                              <?php echo round($grow_data['temperature'], 1); ?>
                               <span class="font-size-30">C</span>
                             <?php endif; ?>
                           </div>
                         </div>
 
                         <!-- Humidity -->
-                        <div id="humid" class="roomStats col-6 col-md-2 col-sm-6 text-left p-0">
+                        <div id="humid" class="roomStats col-4 col-md-2 col-sm-4 text-left p-0">
                           HUMIDITY
                           <?php if($cropThresholds['humidity'] == "Y"): ?>
                             <i class="fas fa-check-circle light-green mr-2"></i>
@@ -242,6 +246,17 @@
                             <span class="font-size-30">%</span>
                           </div>
                         </div>
+
+                      <!-- moisture -->
+                      <div id="moisture" class="roomStats col-4 col-md-2 col-sm-4 text-left p-0">
+                        MOISTURE
+
+                        <div class="font-size-40 medium-grey">
+                          <?php echo round($grow_data['moisture'], 1); ?>
+                          <span class="font-size-30">%</span>
+                        </div>
+                      </div>
+
                         <?php endif; ?>
 
                         <!-- Soil -->
@@ -253,7 +268,7 @@
                           <?php elseif ($soil_status == 1): ?>
                           <i class="fas fa-minus-circle light-red mr-2"></i>
                           <?php endif; ?>
-                          
+
 
                           <div class="font-size-40 medium-grey">
                             <?php if ($soil_status == 0): ?>
@@ -316,23 +331,26 @@
                             <?php endif; ?>
                           </div>
                         </div>
-                        <?php endif; ?> 
+                        <?php endif; ?>
 
                       </div>
-
-                      <?php if ($sensor_state['climate_state'] == 1): ?>
                       <div class="col-md-9 col-xs-6 text-left p-0">
-                          <h4>Grow Climate <small class="text-muted font-size-14">Last 24 Hours</small></h4>
+                          <h4>Grow Climate <small class="text-muted font-size-14">Last 48 hours</small></h4>
                         </div>
                       <div class="chart" style="width:100%;">
                         <canvas id="canvas"></canvas>
                       </div>
-                      <?php endif; ?>
+                      <div class="col-md-9 col-xs-6 text-left p-0">
+                          <h4>Grow Climate <small class="text-muted font-size-14">Last 7 Days</small></h4>
+                        </div>
+                      <div class="chart" style="width:100%;">
+                        <canvas id="canvas7"></canvas>
+                      </div>
                     </div>
 
                     <!-- Journal Tab -->
                     <div class="tab-pane fade p-3" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
-      
+
                       <!-- Crop Journal -->
                       <ul class="list-group list-group-dividered list-group-full pb-4">
 
@@ -340,7 +358,7 @@
                         <?php if(!empty($crop_activity)): ?>
 
                           <?php foreach ($crop_activity as $activity_entry): ?>
-                          
+
                             <!-- Journal Entry -->
                             <li class="list-group-item">
                               <div class="media">
@@ -370,16 +388,16 @@
                                       <?php echo $timeago = get_timeago(strtotime($activity_entry['date_time'])); ?>
                                     </span>
                                   </div>
- 
+
                                   <p class="font-size-12">
                                     <i class="fas fa-calendar-alt pr-1" aria-hidden="true"></i> <?php echo date('d M Y', strtotime($activity_entry['date_time'])); ?>
-                                    <i class="far fa-clock pl-1 pr-1" aria-hidden="true"></i> <?php echo date('H:i', strtotime($activity_entry['date_time'])); ?> 
-                                    <span class="activity_edit medium-grey"> 
-                                      <a href="<?php echo base_url("crop/activity/edit/" . $activity_entry['id']); ?>" class="text-muted ml-2"><i class="fas fa-edit pr-1" aria-hidden="true"></i>Edit</a> 
+                                    <i class="far fa-clock pl-1 pr-1" aria-hidden="true"></i> <?php echo date('H:i', strtotime($activity_entry['date_time'])); ?>
+                                    <span class="activity_edit medium-grey">
+                                      <a href="<?php echo base_url("crop/activity/edit/" . $activity_entry['id']); ?>" class="text-muted ml-2"><i class="fas fa-edit pr-1" aria-hidden="true"></i>Edit</a>
                                       <a href="<?php echo base_url("crop/activity/delete/" . $activity_entry['id']); ?>" class="text-muted ml-2"><i class="fas fa-times-circle pr-1" aria-hidden="true"></i>Delete</a>
                                     </span>
                                   </p>
-                                  
+
                                   <!-- Display Journal Entry Message -->
                                   <?php if (!empty($activity_entry['msg'])) : ?>
 
@@ -393,7 +411,7 @@
 
                               </div>
                             </li>
-        
+
                           <?php endforeach; ?>
 
                         <?php else: ?>
@@ -410,13 +428,13 @@
 
                     <!-- Settings Tab -->
                     <div class="tab-pane fade p-3" id="nav-alerts" role="tabpanel" aria-labelledby="nav-alerts-tab">
-                      
+
                       <!-- Grow Room Settings -->
                       <div class="col-md-12 col-xs-6 text-left">
                         <h3>Grow Room Settings </h3>
                         <h5 class="pb-3">Adjust the light, fan and pump settings.</h5>
                               <?php echo form_open("dashboard/settings"); ?>
-                              
+
                               <!-- Climate Settings -->
                               <?php if ($sensor_state['climate_state'] == 1): ?>
                               <h4>Climate Threshold </h4>
@@ -550,7 +568,7 @@
                               <h4>Fans</h4>
                               <p class="text-muted">The fans will run if the temperature or humidity rises above these temperature thresholds.</p>
                               <div class="form-group row">
-                                    
+
                                     <!-- Fan Climate Thresholds -->
                                     <div class="col-sm-6 pt-1">
                                       <h5>Temperature Thresholds</h5>
@@ -558,7 +576,7 @@
                                         <div class="col-6">
                                           <div class="input-group mb-2">
                                             <?php if(!empty($fan_schedule[0]->fan_temp_threshold)): ?>
-                                              <?php if ($temperature_format == "F"): ?> 
+                                              <?php if ($temperature_format == "F"): ?>
                                                 <input type="text" name="fan_temp_threshold" class="form-control" value="<?php echo celsiusToFahrenheit($fan_schedule[0]->fan_temp_threshold); ?>">
                                               <?php else: ?>
                                                 <input type="text" name="fan_temp_threshold" class="form-control" value="<?php echo $fan_schedule[0]->fan_temp_threshold; ?>">
@@ -644,31 +662,31 @@
                               </div>
                               <?php echo form_close();?>
                       </div>
-                    
+
                     </div>
 
                   </div>
 
                 </div> <!-- END Tabs -->
-              
+
                 <!-- Card Footer -->
                 <div class="card-footer text-muted">
                   <p class="font-size-12 pt-2"><strong class="text-uppercase pr-3">Last Update</strong> <?php echo date('d M Y', strtotime($grow_data['date_time'])) ?> <i class="far fa-clock pl-1 pr-1"></i> <?php echo date('H:i', strtotime($grow_data['date_time'])) ?></p>
                 </div>
 
               </div> <!-- END card -->
-              
+
         </div> <!-- END main -->
 
         <button id="activityButton" class="btn btn-activity site-action btn-floating" type="button" data-toggle="modal" data-target="#addActivity">
           <i class="fas fa-plus"></i>
         </button>
-        
+
         <!-- Crop Activity Modal -->
         <div class="modal fade" id="addActivity" role="dialog" tabindex="-1">
           <div class="modal-dialog">
             <div class="modal-content">
-              
+
               <!-- Modal Header -->
               <div class="modal-header m-2">
                 <h4 class="modal-title">Log Activity</h4>
@@ -680,7 +698,7 @@
               <!-- Log Crop Activity Form -->
               <?php echo form_open('crop/activity/new'); ?>
               <div class="modal-body m-2 pb-2">
-                  
+
                   <!-- Select crop -->
                   <div class="form-group row">
                     <div class="col-3">
@@ -735,12 +753,12 @@
   </div>
   <!-- End Page -->
 
-  
 
-          
-     
-     
-  
+
+
+
+
+
 
     <!-- Site Footer -->
     <?php $this->load->view('core/footer'); ?>
@@ -751,4 +769,4 @@
   </body>
   <!-- /Body -->
 
-</html>
\ No newline at end of file
+</html>
diff --git a/app/assets/css/style.css b/app/assets/css/style.css
index 6d49b88..42f1a2c 100755
--- a/app/assets/css/style.css
+++ b/app/assets/css/style.css
@@ -50,7 +50,7 @@ body {
 
 .fruxe-green {
   color: #64A555;
-} 
+}
 
 .fruxe-dark {
   color:#5C4B51;
@@ -79,17 +79,17 @@ body {
 
 .fruxe-green-bg {
   background-color: #64A555;
-} 
+}
 
 .fruxe-dark-bg {
   background-color: #0F1919;
 }
 
 /* Default Background */
-.default-bg { 
+.default-bg {
   /* The image used */
   background: linear-gradient(0deg,rgba(212,55,89,1),rgba(244, 0, 93,0.5)), url("../img/default_bg.jpg");
-  height: 100%; 
+  height: 100%;
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
@@ -97,10 +97,10 @@ body {
 }
 
 /* Default Background */
-.pages-bg { 
+.pages-bg {
   /* The image used */
   background: linear-gradient(0deg,rgba(255,255,255,1),rgba(255, 255, 255, 0.5)), url("../img/default_bg.jpg");
-  height: 100%; 
+  height: 100%;
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
@@ -108,10 +108,10 @@ body {
 }
 
 /* Camera Background */
-.camera-bg { 
+.camera-bg {
   /* The image used */
   background: linear-gradient(0deg,rgba(212,55,89,1),rgba(244, 0, 93,0.5)), url("../img/crop_bg.jpg");
-  height: 100%; 
+  height: 100%;
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
@@ -215,6 +215,12 @@ canvas {
   -ms-user-select: none;
 }
 
+canvas7 {
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+}
+
 /* The switch - the box around the slider */
 .switch {
   position: relative;
@@ -317,7 +323,7 @@ background: #007b5e;
   #main {
     margin-left: 0;
   }
-} 
+}
 
 /* Small devices (portrait tablets and large phones, 600px and up) */
 @media only screen and (min-width: 600px) {
@@ -327,7 +333,7 @@ background: #007b5e;
   #main {
     margin-left: 0;
   }
-} 
+}
 
 /* Medium devices (landscape tablets, 768px and up) */
 /* @media only screen and (min-width: 768px) {...}  */
@@ -348,23 +354,23 @@ background: #007b5e;
 }
 
 .font-size-12 {
-  font-size: 12px;  
+  font-size: 12px;
 }
 
 .font-size-14 {
-  font-size: 14px;  
+  font-size: 14px;
 }
 
 .font-size-35 {
-  font-size: 35px;  
+  font-size: 35px;
 }
 
 .font-size-40 {
-  font-size: 40px;  
+  font-size: 40px;
 }
 
 .font-size-50 {
-  font-size: 50px;  
+  font-size: 50px;
 }
 
 
@@ -673,4 +679,3 @@ background: #007b5e;
 #img-container {
   visibility: hidden;
 }
-
diff --git a/app/assets/js/chart.js b/app/assets/js/chart.js
old mode 100755
new mode 100644
index 593cb0e..324ab11
--- a/app/assets/js/chart.js
+++ b/app/assets/js/chart.js
@@ -1,56 +1,55 @@
-'use strict';
-
-window.chartColors = {
-	red: 'rgb(226, 0, 78)',
-	blue: 'rgb(35, 175, 190)',
-};
-
-
-// Chart Settings
-window.onload = function() {
-	var ctx = document.getElementById('canvas').getContext('2d');
-	window.myLine = Chart.Line(ctx, {
-		data: lineChartData,
-		options: {
-			
-			responsive: true,
-			hoverMode: 'index',
-			stacked: false,
-			title: {
-				display: false,
-				text: 'Temperature \ Humidity Chart'
-			},
-			scales: {
-				yAxes: [{
-					type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-					display: true,
-					position: 'left',
-					id: 'y-axis-1',
-				}, {
-					type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-					display: true,
-					position: 'right',
-					id: 'y-axis-2',
-
-					// grid line settings
-					gridLines: {
-						drawOnChartArea: false, // only want the grid lines for one axis to show up
-					},
-				}],
-				xAxes: [{
-					ticks: {
-					  // Make labels vertical
-					  // https://stackoverflow.com/questions/28031873/make-x-label-horizontal-in-chartjs
-					  minRotation: 45,
-			
-					  // Limit number of labels
-					  // https://stackoverflow.com/questions/22064577/limit-labels-number-on-chartjs-line-chart
-					  autoSkip: false,
-					  maxTicksLimit: 12}
-					}],
-			}
-		}
-	});
-};
-
-
+'use strict';
+
+window.chartColors = {
+	red: 'rgb(226, 0, 78)',
+	blue: 'rgb(35, 175, 190)',
+};
+
+var options =  {
+			responsive: true,
+			hoverMode: 'index',
+			stacked: false,
+			title: {
+				display: false,
+				text: 'Temperature \ Humidity Chart'
+			},
+			scales: {
+				yAxes: [{
+					type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
+					display: true,
+					position: 'left',
+					id: 'y-axis-1',
+				}, {
+					type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
+					display: true,
+					position: 'right',
+					id: 'y-axis-2',
+
+					// grid line settings
+					gridLines: {
+						drawOnChartArea: false, // only want the grid lines for one axis to show up
+					},
+				}],
+				xAxes: [{
+					ticks: {
+					  minRotation: 45,
+					  autoSkip: false,
+					  maxTicksLimit: 12}
+					}],
+			}
+		}
+// Chart Settings
+window.onload = function() {
+	var ctx7 = document.getElementById('canvas7').getContext('2d');
+	var LineChart7 = new Chart(ctx7, {
+				type: 'line',
+				data: lineChartData7,
+				options: options
+	});
+	var ctx = document.getElementById('canvas').getContext('2d');
+	var LineChart = new Chart(ctx, {
+				type: 'line',
+				data: lineChartData,
+				options: options
+	});
+};
diff --git a/app/assets/tmp/crontab.txt b/app/assets/tmp/crontab.txt
old mode 100644
new mode 100755
diff --git a/db/frx_db.sql b/db/frx_db.sql
index a3858f1..7708788 100644
--- a/db/frx_db.sql
+++ b/db/frx_db.sql
@@ -195,37 +195,38 @@ CREATE TABLE grow_data (
     moisture_status VARCHAR(255) NULL,
     fan_status VARCHAR(255) NULL,
     pump_status VARCHAR(255) NULL,
+    moisture VARCHAR(255) NULL,
     PRIMARY KEY (id)
 );
 
 -- TEST DATA: grow_data
 INSERT INTO grow_data
-    (date_time, temperature, humidity, light_status, moisture_status, fan_status, pump_status)
+    (date_time, temperature, humidity, light_status, moisture_status, fan_status, pump_status, moisture)
 VALUES
-    ('2019-03-20 00:00:00', 25, 75, True, True, True, False),
-    ('2019-03-20 01:00:00', 27, 88, True, True, True, False),
-    ('2019-03-20 02:00:00', 26, 84, True, True, True, False),
-    ('2019-03-20 03:00:00', 26, 80, True, True, True, False),
-    ('2019-03-20 04:00:00', 25, 77, True, True, True, False),
-    ('2019-03-20 05:00:00', 26, 78, True, True, True, False),
-    ('2019-03-20 06:00:00', 25, 75, True, True, True, False),
-    ('2019-03-20 07:00:00', 27, 76, True, True, True, False),
-    ('2019-03-20 08:00:00', 28, 80, True, True, True, False),
-    ('2019-03-20 09:00:00', 25, 75, True, True, True, False),
-    ('2019-03-20 10:00:00', 27, 81, True, True, True, False),
-    ('2019-03-20 11:00:00', 28, 84, True, True, True, False),
-    ('2019-03-20 12:00:00', 28, 83, True, True, True, False),
-    ('2019-03-20 13:00:00', 28, 82, True, True, True, False),
-    ('2019-03-20 14:00:00', 29, 88, True, True, True, False),
-    ('2019-03-20 15:00:00', 30, 90, True, True, True, False),
-    ('2019-03-20 16:00:00', 25, 75, True, True, True, False),
-    ('2019-03-20 17:00:00', 25, 80, True, True, True, False),
-    ('2019-03-20 18:00:00', 25, 79, True, True, True, False),
-    ('2019-03-20 19:00:00', 25, 78, True, True, True, False),
-    ('2019-03-20 20:00:00', 24, 77, True, True, True, False),
-    ('2019-03-20 21:00:00', 24, 74, True, True, True, False),
-    ('2019-03-20 22:00:00', 22, 73, True, True, True, False),
-    ('2019-03-20 23:00:00', 23, 72, True, True, True, False);
+    ('2019-03-20 00:00:00', 25, 75, True, True, True, False, 21),
+    ('2019-03-20 01:00:00', 27, 88, True, True, True, False, 21),
+    ('2019-03-20 02:00:00', 26, 84, True, True, True, False, 21),
+    ('2019-03-20 03:00:00', 26, 80, True, True, True, False, 21),
+    ('2019-03-20 04:00:00', 25, 77, True, True, True, False, 21),
+    ('2019-03-20 05:00:00', 26, 78, True, True, True, False, 21),
+    ('2019-03-20 06:00:00', 25, 75, True, True, True, False, 21),
+    ('2019-03-20 07:00:00', 27, 76, True, True, True, False, 21),
+    ('2019-03-20 08:00:00', 28, 80, True, True, True, False, 21),
+    ('2019-03-20 09:00:00', 25, 75, True, True, True, False, 21),
+    ('2019-03-20 10:00:00', 27, 81, True, True, True, False, 21),
+    ('2019-03-20 11:00:00', 28, 84, True, True, True, False, 21),
+    ('2019-03-20 12:00:00', 28, 83, True, True, True, False, 21),
+    ('2019-03-20 13:00:00', 28, 82, True, True, True, False, 21),
+    ('2019-03-20 14:00:00', 29, 88, True, True, True, False, 21),
+    ('2019-03-20 15:00:00', 30, 90, True, True, True, False, 21),
+    ('2019-03-20 16:00:00', 25, 75, True, True, True, False, 21),
+    ('2019-03-20 17:00:00', 25, 80, True, True, True, False, 21),
+    ('2019-03-20 18:00:00', 25, 79, True, True, True, False, 21),
+    ('2019-03-20 19:00:00', 25, 78, True, True, True, False, 29),
+    ('2019-03-20 20:00:00', 24, 77, True, True, True, False, 27),
+    ('2019-03-20 21:00:00', 24, 74, True, True, True, False, 25),
+    ('2019-03-20 22:00:00', 22, 73, True, True, True, False, 22),
+    ('2019-03-20 23:00:00', 23, 72, True, True, True, False, 21);
 
 
 -- TABLE: climate_history
@@ -236,37 +237,38 @@ CREATE TABLE climate_history (
     date_time DATETIME NOT NULL,
     temperature VARCHAR(255) DEFAULT NULL,
     humidity VARCHAR(255) DEFAULT NULL,
+    moisture VARCHAR(255) DEFAULT NULL,
     PRIMARY KEY (id)
 );
 
 -- TEST DATA: climate_history
 INSERT INTO climate_history
-    (date_time, temperature, humidity)
+    (date_time, temperature, humidity, moisture)
 VALUES
-    ('2019-03-20 00:00:00', 25, 75),
-    ('2019-03-20 01:00:00', 27, 88),
-    ('2019-03-20 02:00:00', 26, 84),
-    ('2019-03-20 03:00:00', 26, 80),
-    ('2019-03-20 04:00:00', 25, 77),
-    ('2019-03-20 05:00:00', 26, 78),
-    ('2019-03-20 06:00:00', 25, 75),
-    ('2019-03-20 07:00:00', 27, 76),
-    ('2019-03-20 08:00:00', 28, 80),
-    ('2019-03-20 09:00:00', 25, 75),
-    ('2019-03-20 10:00:00', 27, 81),
-    ('2019-03-20 11:00:00', 28, 84),
-    ('2019-03-20 12:00:00', 28, 83),
-    ('2019-03-20 13:00:00', 28, 82),
-    ('2019-03-20 14:00:00', 29, 88),
-    ('2019-03-20 15:00:00', 30, 90),
-    ('2019-03-20 16:00:00', 25, 75),
-    ('2019-03-20 17:00:00', 25, 80),
-    ('2019-03-20 18:00:00', 25, 79),
-    ('2019-03-20 19:00:00', 25, 78),
-    ('2019-03-20 20:00:00', 24, 77),
-    ('2019-03-20 21:00:00', 24, 74),
-    ('2019-03-20 22:00:00', 22, 73),
-    ('2019-03-20 23:00:00', 23, 72);
+    ('2019-03-20 00:00:00', 25, 75, 23),
+    ('2019-03-20 01:00:00', 27, 88, 23),
+    ('2019-03-20 02:00:00', 26, 84, 22),
+    ('2019-03-20 03:00:00', 26, 80, 21),
+    ('2019-03-20 04:00:00', 25, 77, 23),
+    ('2019-03-20 05:00:00', 26, 78, 24),
+    ('2019-03-20 06:00:00', 25, 75, 25),
+    ('2019-03-20 07:00:00', 27, 76, 26),
+    ('2019-03-20 08:00:00', 28, 80, 25),
+    ('2019-03-20 09:00:00', 25, 75, 26),
+    ('2019-03-20 10:00:00', 27, 81, 25),
+    ('2019-03-20 11:00:00', 28, 84, 21),
+    ('2019-03-20 12:00:00', 28, 83, 22),
+    ('2019-03-20 13:00:00', 28, 82, 22),
+    ('2019-03-20 14:00:00', 29, 88, 22),
+    ('2019-03-20 15:00:00', 30, 90, 23),
+    ('2019-03-20 16:00:00', 25, 75, 24),
+    ('2019-03-20 17:00:00', 25, 80, 27),
+    ('2019-03-20 18:00:00', 25, 79, 22),
+    ('2019-03-20 19:00:00', 25, 78, 23),
+    ('2019-03-20 20:00:00', 24, 77, 24),
+    ('2019-03-20 21:00:00', 24, 74, 23),
+    ('2019-03-20 22:00:00', 22, 73, 23),
+    ('2019-03-20 23:00:00', 23, 72, 25);
 
 
 -- TABLE: groups
@@ -348,4 +350,4 @@ CREATE TABLE login_attempts (
     login VARCHAR(100) NOT NULL,
     time INT(11) unsigned DEFAULT NULL,
     PRIMARY KEY (id)
-);
\ No newline at end of file
+);
diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile
index 719e444..69ca265 100644
--- a/docker/armv7/Dockerfile
+++ b/docker/armv7/Dockerfile
@@ -6,9 +6,7 @@ LABEL maintainer="dev@fruxe.co"
 # Install Dependencies
 RUN apt-get update && \
   apt-get install -y apache2 libapache2-mod-php5 mysql-server php5-mysql pwgen php-apc php5-mcrypt cron nano git unzip && \
-  apt-get install -y python python-dev python-pip && \
-  pip install --upgrade pip setuptools wheel && \
-  pip install Adafruit_DHT pymysql RPi.GPIO
+  python3 -m pip install Adafruit_DHT pymysql RPi.GPIO requests adafruit-circuitpython-ads1x15
 
 # Configure Apache
 RUN a2enmod rewrite
diff --git a/update.sh b/update.sh
index 43406cc..6cdd066 100755
--- a/update.sh
+++ b/update.sh
@@ -106,11 +106,6 @@ run_update() {
 
     echo -e "\e[35mRunning update...\e[0m"
 
-    # Fetch updates
-    check_for_git
-    sudo git fetch --all
-    git reset --hard origin/master
-
     # Rebuild docker containers
     build_containers