From e5559022c15640d75b46fd7eb5f173ae8d59415e Mon Sep 17 00:00:00 2001
From: surfrock66 <surfrock66@surfrock66.com>
Date: Sat, 2 Feb 2019 22:53:08 -0800
Subject: [PATCH] This is a major, structural change which represents a new
 release.  The entire structure of the data storage has been changed.  Instead
 of a single raw_logs table, it's now broken into months.  Additionally,
 session information has been broken out of the raw_logs and is solely stored
 in the sessions table.  In order to accomplish this, there is a MAJOR
 database restructuring, requiring the execution of 'db_upgrade.php' which can
 take HOURS to run depending on how much data you have.  PLEASE BACK UP YOUR
 DATABASE BEFORE RUNNING THAT.  PLEASE LOOK AT THE ACTUAL CODE I AM RUNNING
 and consider running it manually.  The most important user-facing
 changes...1) session filtering is now Year_Month instead of year AND month. 
 2) The GPS coordinates have been changed from float to Double, making the
 lines smoother.  3) You can now select favorite PIDs in the PID Edit page,
 and those are now auto-selected to be populated for plotting when the app
 loads.

---
 README.md                            |   7 +
 scripts/create_torque_keys_table.sql | 299 ++++++++++++++-------------
 scripts/create_torque_log_table.sql  |  20 +-
 web/db_upgrade.php                   |  49 +++++
 web/del_session.php                  |   9 +-
 web/export.php                       |   5 +-
 web/get_columns.php                  |   4 +-
 web/get_sessions.php                 |  51 ++---
 web/merge_sessions.php               |   6 +-
 web/pid_commit.php                   |  28 ++-
 web/pid_edit.php                     |  11 +-
 web/plot.php                         |   5 +-
 web/session.php                      |  89 +++-----
 web/static/css/torque.css            |   2 +-
 web/static/js/torquehelpers.js       |  12 +-
 web/upload_data.php                  | 207 ++++++++++++++-----
 web/url.php                          |  25 +--
 17 files changed, 477 insertions(+), 352 deletions(-)
 create mode 100644 web/db_upgrade.php

diff --git a/README.md b/README.md
index 54adda8b..e78d853d 100644
--- a/README.md
+++ b/README.md
@@ -136,3 +136,10 @@ LimitRequestLine 15000
   * Email-receiver for this?  LONG SHOT, but have the server read an email address so you can email tracks from the app
 * Ian Hawkins has a google map pin show up when hovering over his graphs on his reference viewer...different system, but it'd be cool to implement.
 * Idea: speed heatmap for the map track. (Google Maps iOS API has gradient polylines, javascript API does not...may not be possible for now).
+
+### Credits and Thanks ###
+
+* [Ian Hawkins](http://ian-hawkins.com/) - Creator of the Torque app, none of this happens without that
+* [Matt Nicklay/econpy](https://github.com/econpy) - This is the project I forked from, so all credit where credit is due
+* [Takashi Saito/takashisite](https://github.com/takashisite) - Spawn for the patch to change the GPS from float to double; I didn't take his pull request because it came with a greater structural update, but he deserves credit for pointing it out
+* [marvinwankersteen](https://github.com/marvinwankersteen) - Gave me the idea to implement the "favorite variables" system.
diff --git a/scripts/create_torque_keys_table.sql b/scripts/create_torque_keys_table.sql
index 2b3e718c..b2d41f21 100644
--- a/scripts/create_torque_keys_table.sql
+++ b/scripts/create_torque_keys_table.sql
@@ -20,155 +20,160 @@ CREATE TABLE `torque_keys` (
   `description` varchar(255) COMMENT 'Description',
   `type` varchar(255) NOT NULL DEFAULT 'varchar(255)' COMMENT 'Variable Type',
   `units` varchar(255) COMMENT 'Units',
-  `populated` boolean NOT NULL DEFAULT '0' COMMENT 'Is This Variable Populated?',
+  `populated, favorite` boolean NOT NULL DEFAULT '0' COMMENT 'Is This Variable Populated?',
+  `favorite` boolean NOT NULL DEFAULT '0' COMMENT 'Pre-select this variable for plotting?',
   `min` float COMMENT 'Minimum Value',
   `max` float COMMENT 'Maximum Value',
   KEY `id` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff122e','0-100kph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff124f','0-200kph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1277','0-30mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff122d','0-60mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff122f','1/4 mile Time','float','s',1,0,30);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1230','1/8 mile Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1264','100-0kph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1260','40-60mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1265','60-0mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff125e','60-120mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1276','60-130mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff125f','60-80mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1261','80-100mph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1275','80-120kph Time','float','s',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k47','Absolute Throttle Position B','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1223','Acceleration Sensor (Total)','float','g',1,-1,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1220','Acceleration Sensor (X Axis)','float','g',1,-1,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1221','Acceleration Sensor (Y Axis)','float','g',1,-1,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1222','Acceleration Sensor (Z Axis)','float','g',1,-1,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k49','Accelerator Pedal Position D','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k4a','Accelerator Pedal Position E','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k4b','Accelerator Pedal Position F','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated, min, max) VALUES ('kff124d','Air Fuel Ratio (Commanded)','float',1,0,30);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('kff1249','Air Fuel Ratio (Measured)','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k12','Air Status','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k46','Ambient Air Temp','float','&deg;C',1,-40,50);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1263','Average Trip Speed (Whilst Moving Only)','float','km/h',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1272','Average Trip Speed (Whilst Stopped or Moving)','float','km/h',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1270','Barometer (On Android device)','float','mb',1,800,1100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k33','Barometric Pressure (From Vehicle)','float','kPa',1,0,255);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k3c','Catalyst Temperature (Bank 1 Sensor 1)','float','&deg;C',1,0,60);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k3e','Catalyst Temperature (Bank 1 Sensor 2)','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k3d','Catalyst Temperature (Bank 2 Sensor 1)','float','&deg;C',1,0,60);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k3f','Catalyst Temperature (Bank 2 Sensor 2)','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1258','CO2 (Average)','float','g/km',1,0,120);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1257','CO2 (Instantaneous)','float','g/km',1,0,120);
-INSERT INTO torque_keys (id, description, type, populated, min, max) VALUES ('k44','Commanded Equivalence Ratio (lambda)','float',1,0,2);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff126d','Cost per mile/km (Instant)','float','$/km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff126e','Cost per mile/km (Trip)','float','$/km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff126a','Distance to empty (Estimated)','float','km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k31','Distance Travelled Since Codes Cleared','float','km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k21','Distance Travelled With MIL/CEL Lit','float','km',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k2c','EGR Commanded','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k2d','EGR Error','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k5','Engine Coolant Temperature','float','&deg;C',1,-40,120);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1273','Engine kW (At the Wheels)','float','kW',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k4','Engine Load','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k43','Engine Load (Absolute)','float','%',1,0,20000);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k5c','Engine Oil Temperature','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kc','Engine RPM','float','rpm',1,0,10000);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k52','Ethanol Fuel %','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k32','Evap System Vapor Pressure','float','Pa',1,0,1000);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k78','Exhaust Gas Temperature 1','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k79','Exhaust Gas Temperature 2','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff125c','Fuel Cost (Trip)','float','$',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff125d','Fuel Flow Rate/Hour','float','l/hr',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff125a','Fuel Flow Rate/Minute','float','cc/min',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k2f','Fuel Level (From Engine ECU)','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('ka','Fuel Pressure','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k23','Fuel Rail Pressure','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k22','Fuel Rail Pressure (Relative to Manifold Vacuum)','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff126b','Fuel Remaining (Calculated From Vehicle Profile)','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k3','Fuel Status','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k7','Fuel Trim Bank 1 Long Term','float','%',1,-25,25);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k14','Fuel Trim Bank 1 Sensor 1','float','%',1,-100,100);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k15','Fuel Trim Bank 1 Sensor 2','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k16','Fuel Trim Bank 1 Sensor 3','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k17','Fuel Trim Bank 1 Sensor 4','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k6','Fuel Trim Bank 1 Short Term','float','%',1,-25,25);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k9','Fuel Trim Bank 2 Long Term','float','%',1,-25,25);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k18','Fuel Trim Bank 2 Sensor 1','float','%',1,-100,100);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k19','Fuel Trim Bank 2 Sensor 2','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k1a','Fuel Trim Bank 2 Sensor 3','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k1b','Fuel Trim Bank 2 Sensor 4','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k8','Fuel Trim Bank 2 Short Term','float','%',1,-25,25);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1271','Fuel Used (Trip)','float','l',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1239','GPS Accuracy','float','m',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1010','GPS Altitude','float','m',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff123b','GPS Bearing','float','&deg;',1,0,360);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1006','GPS Latitude','float','&deg;',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1005','GPS Longitude','float','&deg;',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated, min, max) VALUES ('kff123a','GPS Satellites','float',1,0,10);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1237','GPS vs OBD Speed Difference','float','km/h',1,0,10);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1226','Horsepower (At the Wheels)','float','hp',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kf','Intake Air Temperature','float','&deg;C',1,-40,60);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kb','Intake Manifold Pressure','float','kPa',1,0,255);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1203','Kilometers Per Litre (Instant)','float','kpl',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff5202','Kilometers Per Litre (Long Term Average)','float','kpl',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1207','Litres Per 100 Kilometer (Instant)','float','l/100km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff5203','Litres Per 100 Kilometer (Long Term Average)','float','l/100km',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k10','Mass Air Flow Rate','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1201','Miles Per Gallon (Instant)','float','mpg',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff5201','Miles Per Gallon (Long Term Average)','float','mpg',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k24','O2 Sensor1 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k34','O2 Sensor1 Equivalence Ratio (Alternate)','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1240','O2 Sensor1 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k25','O2 Sensor2 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1241','O2 Sensor2 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k26','O2 Sensor3 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1242','O2 Sensor3 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k27','O2 Sensor4 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1243','O2 Sensor4 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k28','O2 Sensor5 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1244','O2 Sensor5 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k29','O2 Sensor6 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1245','O2 Sensor6 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k2a','O2 Sensor7 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1246','O2 Sensor7 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('k2b','O2 Sensor8 Equivalence Ratio','float',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1247','O2 Sensor8 Wide-range Voltage','float','V',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1214','O2 Volts Bank 1 Sensor 1','float','V',1,0,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1215','O2 Volts Bank 1 Sensor 2','float','V',1,0,1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1216','O2 Volts Bank 1 Sensor 3','float','V',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1217','O2 Volts Bank 1 Sensor 4','float','V',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1218','O2 Volts Bank 2 Sensor 1','float','V',1,0,1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1219','O2 Volts Bank 2 Sensor 2','float','V',1,0,1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff121a','O2 Volts Bank 2 Sensor 3','float','V',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff121b','O2 Volts Bank 2 Sensor 4','float','V',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('k5a','Relative Accelerator Pedal Position','float','%',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k45','Relative Throttle Position','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k1f','Run Time Since Engine Start','float','s',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('session','Session ID','varchar(255)',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1001','Speed (GPS)','float','km/h',1,0,160);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kd','Speed (OBD)','float','km/h',1,0,160);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k11','Throttle Position (Manifold)','float','%',1,0,100);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('kff124a','Tilt (x)','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('kff124b','Tilt (y)','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('kff124c','Tilt (z)','float',1);
-INSERT INTO torque_keys (id, description, type, populated) VALUES ('time','Timestamp','varchar(255)',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('ke','Timing Advance','float','&deg;',1,-64,63);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1225','Torque','float','ft-lb',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kfe1805','Transmission Temperature (Method 1)','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kb4','Transmission Temperature (Method 2)','float','&deg;C',1);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1206','Trip Average KPL','float','kpl',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1208','Trip Average Litres/100 KM','float','l/100km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1205','Trip Average MPG','float','mpg',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1204','Trip Distance','float','km',1,0,200);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff120c','Trip Distance (Stored in Vehicle Profile)','float','km',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1266','Trip Time (Since Journey Start)','float','s',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1268','Trip Time (Whilst Moving)','float','s',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1267','Trip Time (Whilst Stationary)','float','s',1,0,100);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1202','Turbo Boost & Vacuum Gauge','float','psi',1,-20,20);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('k42','Voltage (Control Module)','float','V',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated, min, max) VALUES ('kff1238','Voltage (OBD Adapter)','float','V',1,0,16);
-INSERT INTO torque_keys (id, description, type,  units, populated) VALUES ('kff1269','Volumetric Efficiency (Calculated)','float','%',1);
-INSERT INTO torque_keys (id, type, populated) VALUES ('kff1007','float', 0);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff122e','0-100kph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1278','0-100mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff124f','0-200kph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1277','0-30mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff122d','0-60mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff122f','1/4 mile Time','float','s',1,0,0,30);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1230','1/8 mile Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1264','100-0kph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1280','100-200kph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1260','40-60mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1265','60-0mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff125e','60-120mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1276','60-130mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff125f','60-80mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1261','80-100mph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1275','80-120kph Time','float','s',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k47','Absolute Throttle Position B','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1223','Acceleration Sensor (Total)','float','g',1,0,-1,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1220','Acceleration Sensor (X Axis)','float','g',1,0,-1,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1221','Acceleration Sensor (Y Axis)','float','g',1,0,-1,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1222','Acceleration Sensor (Z Axis)','float','g',1,0,-1,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k49','Accelerator Pedal Position D','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k4a','Accelerator Pedal Position E','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k4b','Accelerator Pedal Position F','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('kff124d','Air Fuel Ratio (Commanded)','float',1,0,0,30);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('kff1249','Air Fuel Ratio (Measured)','float',1,0,0,30);
+INSERT INTO torque_keys (id, description, type, populated, favorite) VALUES ('k12','Air Status','float',1,0);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k46','Ambient Air Temp','float','&deg;C',1,0,-40,50);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff129a','Android Device Battery Level','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1263','Average Trip Speed (Whilst Moving Only)','float','km/h',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1272','Average Trip Speed (Whilst Stopped or Moving)','float','km/h',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1270','Barometer (On Android device)','float','mb',1,0,800,1100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k33','Barometric Pressure (From Vehicle)','float','kPa',1,0,0,255);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k3c','Catalyst Temperature (Bank 1 Sensor 1)','float','&deg;C',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k3e','Catalyst Temperature (Bank 1 Sensor 2)','float','&deg;C',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k3d','Catalyst Temperature (Bank 2 Sensor 1)','float','&deg;C',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k3f','Catalyst Temperature (Bank 2 Sensor 2)','float','&deg;C',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1258','CO2 (Average)','float','g/km',1,0,0,120);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1257','CO2 (Instantaneous)','float','g/km',1,0,0,120);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k44','Commanded Equivalence Ratio (lambda)','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff126d','Cost per mile/km (Instant)','float','$/km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff126e','Cost per mile/km (Trip)','float','$/km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff126a','Distance to empty (Estimated)','float','km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k31','Distance Travelled Since Codes Cleared','float','km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k21','Distance Travelled With MIL/CEL Lit','float','km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k2c','EGR Commanded','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k2d','EGR Error','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k5','Engine Coolant Temperature','float','&deg;C',1,0,-40,120);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1273','Engine kW (At the Wheels)','float','kW',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k4','Engine Load','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k43','Engine Load (Absolute)','float','%',1,0,0,20000);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k5c','Engine Oil Temperature','float','&deg;C',1,0,-40,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kc','Engine RPM','float','rpm',1,0,0,10000);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k52','Ethanol Fuel %','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k32','Evap System Vapor Pressure','float','Pa',1,0,0,1000);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k78','Exhaust Gas Temperature Bank 1 Sensor 1','float','&deg;C',1,0,0,600);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k79','Exhaust Gas Temperature Bank 2 Sensor 1','float','&deg;C',1,0,0,600);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff125c','Fuel Cost (Trip)','float','$',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff125d','Fuel Flow Rate/Hour','float','l/hr',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff125a','Fuel Flow Rate/Minute','float','cc/min',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k2f','Fuel Level (From Engine ECU)','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('ka','Fuel Pressure','float','kPa',1,0,0,765);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k23','Fuel Rail Pressure','float','kPa',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k22','Fuel Rail Pressure (Relative to Manifold Vacuum)','float','kPa',1,0,0,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff126b','Fuel Remaining (Calculated From Vehicle Profile)','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, populated, favorite) VALUES ('k3','Fuel Status','float',1,0);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k7','Fuel Trim Bank 1 Long Term','float','%',1,0,-25,25);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k14','Fuel Trim Bank 1 Sensor 1','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k15','Fuel Trim Bank 1 Sensor 2','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k16','Fuel Trim Bank 1 Sensor 3','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k17','Fuel Trim Bank 1 Sensor 4','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k6','Fuel Trim Bank 1 Short Term','float','%',1,0,-25,25);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k9','Fuel Trim Bank 2 Long Term','float','%',1,0,-25,25);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k18','Fuel Trim Bank 2 Sensor 1','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k19','Fuel Trim Bank 2 Sensor 2','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k1a','Fuel Trim Bank 2 Sensor 3','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k1b','Fuel Trim Bank 2 Sensor 4','float','%',1,0,-100,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k8','Fuel Trim Bank 2 Short Term','float','%',1,0.-25,25);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1271','Fuel Used (Trip)','float','l',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1239','GPS Accuracy','float','m',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1010','GPS Altitude','float','m',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff123b','GPS Bearing','float','&deg;',1,0,0,360);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1006','GPS Latitude','double','&deg;',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1005','GPS Longitude','double','&deg;',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('kff123a','GPS Satellites','float',1,0,0,24);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1237','GPS vs OBD Speed Difference','float','km/h',1,0,0,10);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1226','Horsepower (At the Wheels)','float','hp',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kf','Intake Air Temperature','float','&deg;C',1,0,-40,60);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kb','Intake Manifold Pressure','float','kPa',1,0,0,255);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1203','Kilometers Per Litre (Instant)','float','kpl',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff5202','Kilometers Per Litre (Long Term Average)','float','kpl',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1207','Litres Per 100 Kilometer (Instant)','float','l/100km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff5203','Litres Per 100 Kilometer (Long Term Average)','float','l/100km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k10','Mass Air Flow Rate','float','g/s',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1201','Miles Per Gallon (Instant)','float','mpg',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff5201','Miles Per Gallon (Long Term Average)','float','mpg',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k24','O2 Sensor1 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k34','O2 Sensor1 Equivalence Ratio (Alternate)','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1240','O2 Sensor1 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k25','O2 Sensor2 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1241','O2 Sensor2 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k26','O2 Sensor3 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1242','O2 Sensor3 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k27','O2 Sensor4 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1243','O2 Sensor4 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k28','O2 Sensor5 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1244','O2 Sensor5 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k29','O2 Sensor6 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1245','O2 Sensor6 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k2a','O2 Sensor7 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1246','O2 Sensor7 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, populated, favorite, min, max) VALUES ('k2b','O2 Sensor8 Equivalence Ratio','float',1,0,0,2);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1247','O2 Sensor8 Wide-range Voltage','float','V',1,0,0,8);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1214','O2 Volts Bank 1 Sensor 1','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1215','O2 Volts Bank 1 Sensor 2','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1216','O2 Volts Bank 1 Sensor 3','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1217','O2 Volts Bank 1 Sensor 4','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1218','O2 Volts Bank 2 Sensor 1','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1219','O2 Volts Bank 2 Sensor 2','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff121a','O2 Volts Bank 2 Sensor 3','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff121b','O2 Volts Bank 2 Sensor 4','float','V',1,0,0,1);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1296','Percentage of City Driving','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1297','Percentage of Highway Driving','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1298','Percentage of Idle Driving','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k5a','Relative Accelerator Pedal Position','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k45','Relative Throttle Position','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k1f','Run Time Since Engine Start','float','s',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1001','Speed (GPS)','float','km/h',1,0,0,160);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kd','Speed (OBD)','float','km/h',1,1,0,160);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k11','Throttle Position (Manifold)','float','%',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, populated, favorite) VALUES ('kff124a','Tilt (x)','float',1,0);
+INSERT INTO torque_keys (id, description, type, populated, favorite) VALUES ('kff124b','Tilt (y)','float',1,0);
+INSERT INTO torque_keys (id, description, type, populated, favorite) VALUES ('kff124c','Tilt (z)','float',1,0);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('ke','Timing Advance','float','&deg;',1,0,-64,63);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1225','Torque','float','ft-lb',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kfe1805','Transmission Temperature (Method 1)','float','&deg;C',1,0,0,105);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kb4','Transmission Temperature (Method 2)','float','&deg;C',1,0,0,105);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1206','Trip Average KPL','float','kpl',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1208','Trip Average Litres/100 KM','float','l/100km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1205','Trip Average MPG','float','mpg',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1204','Trip Distance','float','km',1,0,0,200);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff120c','Trip Distance (Stored in Vehicle Profile)','float','km',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1266','Trip Time (Since Journey Start)','float','s',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1268','Trip Time (Whilst Moving)','float','s',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1267','Trip Time (Whilst Stationary)','float','s',1,0,0,100);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1202','Turbo Boost & Vacuum Gauge','float','psi',1,0,-20,20);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('k42','Voltage (Control Module)','float','V',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite, min, max) VALUES ('kff1238','Voltage (OBD Adapter)','float','V',1,0,0,16);
+INSERT INTO torque_keys (id, description, type, units, populated, favorite) VALUES ('kff1269','Volumetric Efficiency (Calculated)','float','%',1,0);
+INSERT INTO torque_keys (id, type, populated, favorite) VALUES ('kff1007','float', 0,0);
diff --git a/scripts/create_torque_log_table.sql b/scripts/create_torque_log_table.sql
index f72c78ee..bd2d68e4 100644
--- a/scripts/create_torque_log_table.sql
+++ b/scripts/create_torque_log_table.sql
@@ -16,18 +16,8 @@ PREPARE stmt FROM @query;
 EXECUTE stmt;
 #DROP TABLE IF EXISTS `raw_logs`;
 CREATE TABLE `raw_logs` (
-  `v` varchar(1) NOT NULL,
   `session` varchar(15) NOT NULL,
-  `id` varchar(32) NOT NULL,
   `time` varchar(15) NOT NULL,
-  `eml` varchar(255),
-  `profileName` varchar(255) NOT NULL DEFAULT '0',
-  `profileFuelType` varchar(255) NOT NULL DEFAULT 'Not Specified',
-  `profileWeight` float NOT NULL DEFAULT '0',
-  `profileVe` float NOT NULL DEFAULT '0',
-  `profileFuelCost` float NOT NULL DEFAULT '0',
-  `notice` varchar(255),
-  `noticeClass` varchar(255),
   `k10` float NOT NULL DEFAULT '0',
   `k11` float NOT NULL DEFAULT '0',
   `k12` float NOT NULL DEFAULT '0',
@@ -92,8 +82,8 @@ CREATE TABLE `raw_logs` (
   `kf` float NOT NULL DEFAULT '0',
   `kfe1805` float NOT NULL DEFAULT '0',
   `kff1001` float NOT NULL DEFAULT '0',
-  `kff1005` float NOT NULL DEFAULT '0',
-  `kff1006` float NOT NULL DEFAULT '0',
+  `kff1005` double NOT NULL DEFAULT '0',
+  `kff1006` double NOT NULL DEFAULT '0',
   `kff1007` float NOT NULL DEFAULT '0',
   `kff1010` float NOT NULL DEFAULT '0',
   `kff1201` float NOT NULL DEFAULT '0',
@@ -169,6 +159,12 @@ CREATE TABLE `raw_logs` (
   `kff1275` float NOT NULL DEFAULT '0',
   `kff1276` float NOT NULL DEFAULT '0',
   `kff1277` float NOT NULL DEFAULT '0',
+  `kff1278` float NOT NULL DEFAULT '0',
+  `kff1280` float NOT NULL DEFAULT '0',
+  `kff1296` float NOT NULL DEFAULT '0',
+  `kff1297` float NOT NULL DEFAULT '0',
+  `kff1298` float NOT NULL DEFAULT '0',
+  `kff129a` float NOT NULL DEFAULT '0',
   `kff5201` float NOT NULL DEFAULT '0',
   `kff5202` float NOT NULL DEFAULT '0',
   `kff5203` float NOT NULL DEFAULT '0',
diff --git a/web/db_upgrade.php b/web/db_upgrade.php
new file mode 100644
index 00000000..d7d8521d
--- /dev/null
+++ b/web/db_upgrade.php
@@ -0,0 +1,49 @@
+<?php
+  require_once ('db.php');
+  require_once ('auth_app.php');
+
+  mysqli_query($con, "ALTER TABLE $db_keys_table ADD COLUMN favorite TINYINT(1) NOT NULL DEFAULT 0") or die(mysqli_error($con));
+  // Update existing tables to handle new data structures
+  $table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
+  while( $row = mysqli_fetch_assoc($table_list) ) {
+    $db_table_name = $row["table_name"];
+    // Change the GPS Latitude and Longitude datapoints from Float to Double to improve accuracy
+    $sqlLatQuery = "ALTER TABLE $db_table_name MODIFY kff1006 DOUBLE NOT NULL DEFAULT '0'";
+    mysqli_query($con, $sqlLatQuery) or die(mysqli_error($con));
+    $sqlLongQuery = "ALTER TABLE $db_table_name MODIFY kff1005 DOUBLE NOT NULL DEFAULT '0'";
+    mysqli_query($con, $sqlLongQuery) or die(mysqli_error($con));
+    // Delete columns which are now redundant and just stored with the session
+    $sqlVQuery = "ALTER TABLE $db_table_name DROP COLUMN v";
+    mysqli_query($con, $sqlVQuery) or die(mysqli_error($con));
+    $sqlIdQuery = "ALTER TABLE $db_table_name DROP COLUMN id";
+    mysqli_query($con, $sqlIdQuery) or die(mysqli_error($con));
+    $sqlEmlQuery = "ALTER TABLE $db_table_name DROP COLUMN eml";
+    mysqli_query($con, $sqlEmlQuery) or die(mysqli_error($con));
+    $sqlProfileNameQuery = "ALTER TABLE $db_table_name DROP COLUMN profileName";
+    mysqli_query($con, $sqlProfileNameQuery) or die(mysqli_error($con));
+    $sqlProfileFuelTypeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelType";
+    mysqli_query($con, $sqlProfileFuelTypeQuery) or die(mysqli_error($con));
+    $sqlProfileWeightQuery = "ALTER TABLE $db_table_name DROP COLUMN profileWeight";
+    mysqli_query($con, $sqlProfileWeightQuery) or die(mysqli_error($con));
+    $sqlProfileVeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileVe";
+    mysqli_query($con, $sqlProfileVeQuery) or die(mysqli_error($con));
+    $sqlProfileFuelCostQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelCost";
+    mysqli_query($con, $sqlProfileFuelCostQuery) or die(mysqli_error($con));
+    
+  }
+
+  // Split the raw logs table into per-month tables 
+  $sessionYears = mysqli_query($con, "SELECT DISTINCT CONCAT(YEAR(FROM_UNIXTIME(session/1000)), '_', DATE_FORMAT(FROM_UNIXTIME(session/1000),'%m')) as Suffix, YEAR(FROM_UNIXTIME(session/1000)) as Year, MONTH(FROM_UNIXTIME(session/1000)) as Month FROM $db_table");
+  while( $row = mysqli_fetch_assoc( $sessionYears ) ) {
+    $suffix = $row['Suffix'];
+    $year = $row['Year'];
+    $month = $row['Month'];
+    $new_table_name = "{$db_table}_test_{$suffix}";
+    $table_create_query = "CREATE TABLE $new_table_name SELECT * FROM $db_table WHERE YEAR(FROM_UNIXTIME(session/1000)) LIKE '$year' and MONTH(FROM_UNIXTIME(session/1000)) LIKE '$month'";
+    mysqli_query($con, $table_create_query) or die(mysqli_error($con));
+  }
+
+  // Clear the raw_logs table; we still want it as a shell, just empty
+  mysqli_query($con, "DELETE FROM $db_table") or die(mysqli_error($con));
+?>
+
diff --git a/web/del_session.php b/web/del_session.php
index 99d53a52..ee14dcc7 100644
--- a/web/del_session.php
+++ b/web/del_session.php
@@ -12,13 +12,14 @@
 }
 
 if (isset($deletesession) && !empty($deletesession)) {
-    $delresult = mysqli_query($con, "DELETE FROM $db_table
-                          WHERE session=".quote_value($deletesession)) or die(mysqli_error($con));
+    $tableYear = date( "Y", $deletesession/1000 );
+    $tableMonth = date( "m", $deletesession/1000 );
+    $db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
+    $delresult = mysqli_query($con, "DELETE FROM $db_table_full WHERE session=".quote_value($deletesession)) or die(mysqli_error($con));
 
     mysqli_free_result($delresult);
 
-    $delresult = mysqli_query($con, "DELETE FROM $db_sessions_table
-                          WHERE session=".quote_value($deletesession)) or die(mysqli_error($con));
+    $delresult = mysqli_query($con, "DELETE FROM $db_sessions_table WHERE session=".quote_value($deletesession)) or die(mysqli_error($con));
 
     mysqli_free_result($delresult);
 }
diff --git a/web/export.php b/web/export.php
index adbd5994..657110c0 100644
--- a/web/export.php
+++ b/web/export.php
@@ -5,7 +5,10 @@
     $session_id = $_GET['sid'];
     // Get data for session
     $output = "";
-    $sql = mysqli_query($con, "SELECT * FROM $db_table join $db_sessions_table on $db_table.session = $db_sessions_table.session WHERE $db_table.session=".quote_value($session_id)." ORDER BY $db_table.time DESC;") or die(mysqli_error($con));
+    $tableYear = date( "Y", $session_id/1000 );
+    $tableMonth = date( "m", $session_id/1000 );
+    $db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
+    $sql = mysqli_query($con, "SELECT * FROM $db_table_full join $db_sessions_table on $db_table_full.session = $db_sessions_table.session WHERE $db_table_full.session=".quote_value($session_id)." ORDER BY $db_table_full.time DESC;") or die(mysqli_error($con));
 
     if ($_GET["filetype"] == "csv") {
         $columns_total = mysqli_num_fields($sql);
diff --git a/web/get_columns.php b/web/get_columns.php
index ef2671ac..bf8925a4 100644
--- a/web/get_columns.php
+++ b/web/get_columns.php
@@ -6,10 +6,10 @@
 // 2015.08.21 - edit by surfrock66 - Rather than pull from the column comments,
 //   oull from a new database created which manages variables. Include
 //   a column flagging whether a variable is populated or not.
-$colqry = mysqli_query($con, "SELECT id,description,type FROM $db_keys_table WHERE populated = 1 ORDER BY description") or die(mysqli_error($con));
+$colqry = mysqli_query($con, "SELECT id,description,type,favorite FROM $db_keys_table WHERE populated = 1 ORDER BY description") or die(mysqli_error($con));
 while ($x = mysqli_fetch_array($colqry)) {
   if ((substr($x[0], 0, 1) == "k") && ($x[2] == "float")) {
-    $coldata[] = array("colname"=>$x[0], "colcomment"=>$x[1]);
+    $coldata[] = array("colname"=>$x[0], "colcomment"=>$x[1], "colfavorite"=>$x[3]);
   }
 }
 
diff --git a/web/get_sessions.php b/web/get_sessions.php
index 92824f72..c2c3d4ba 100644
--- a/web/get_sessions.php
+++ b/web/get_sessions.php
@@ -1,36 +1,17 @@
 <?php
-//echo "<!-- Begin get_session.php at ".date("H:i:s", microtime(true))." -->\r\n";
+//echo "<!-- Begin get_sessions.php at ".date("H:i:s", microtime(true))." -->\r\n";
 // this page relies on being included from another page that has already connected to db
 
 session_set_cookie_params(0,dirname($_SERVER['SCRIPT_NAME']));
 if (!isset($_SESSION)) { session_start(); }
 
-// Process the 4 possibilities for the year filter: Set in POST, Set in GET, select all possible years, or the default: select the current year
-if ( isset($_POST["selyear"]) ) {
-	$filteryear = $_POST["selyear"];
-} elseif ( isset($_GET["year"])) {
-	$filteryear = $_GET["year"];
+// Process the possibilities for the year and month filter: Set in POST, Set in GET, select all possible year/months, or the default: select the current year/month
+if ( isset($_POST["selyearmonth"]) ) {
+	$filteryearmonth = $_POST["selyearmonth"];
+} elseif ( isset($_GET["yearmonth"])) {
+	$filteryearmonth = $_GET["yearmonth"];
 } else {
-	$filteryear = date('Y');
-}
-if ( $filteryear == "ALL" ) {
-	$filteryear = "%";
-}
-
-// Process the 4 possibilities for the month filter: Set in POST, Set in GET, select all possible months, or the default: select the current month
-if ( isset($_POST["selmonth"]) ) {
-	$filtermonth = $_POST["selmonth"];
-} elseif ( isset($_GET["month"])) {
-	$filtermonth = $_GET["month"];
-} else {
-	if ( isset($_POST["selyear"]) || isset($_GET["year"]) ) {
-		$filtermonth = "%";
-	} else {
-		$filtermonth = date('F');
-	}
-}
-if ( $filtermonth == "ALL" ) {
-	$filtermonth = "%";
+	$filteryearmonth = date('Y_m');
 }
 
 // Process the 4 possibilities for the profile filter: Set in POST, Set in GET, select all possible profiles, or no filter as default
@@ -45,22 +26,18 @@
 	$filterprofile = "%";
 }
 
-// Build the MySQL select string based on the inputs (year, month, or session id)
+
+// Build the MySQL select string based on the inputs (year_month or session id)
 $sessionqrystring = "SELECT timestart, timeend, session, profileName, sessionsize FROM $db_sessions_table ";
-$sqlqryyear = "YEAR(FROM_UNIXTIME(session/1000)) LIKE " . quote_value($filteryear) . " ";
-$sqlqrymonth = "MONTHNAME(FROM_UNIXTIME(session/1000)) LIKE " . quote_value($filtermonth) . " ";
+$sqlqryyearmonth = "CONCAT(YEAR(FROM_UNIXTIME(session/1000)), '_', DATE_FORMAT(FROM_UNIXTIME(session/1000),'%m')) LIKE " . quote_value($filteryearmonth) . " ";
 $sqlqryprofile = "profileName LIKE " . quote_value($filterprofile) . " " ;
 $orselector = "WHERE ";
 $andselector = "";
-if ( $filteryear <> "%" || $filtermonth <> "%" || $filterprofile <> "%") {
+if ( $filteryearmonth <> "%" || $filterprofile <> "%") {
 	$orselector = " OR ";
 	$sessionqrystring = $sessionqrystring . "WHERE ( ";
-	if ( $filteryear <> "%" ) {
-		$sessionqrystring = $sessionqrystring . $sqlqryyear;
-		$andselector = " AND ";
-	}
-	if ( $filtermonth <> "%" ) {
-		$sessionqrystring = $sessionqrystring . $andselector . $sqlqrymonth;
+	if ( $filteryearmonth <> "%" ) {
+		$sessionqrystring = $sessionqrystring . $sqlqryyearmonth;
 		$andselector = " AND ";
 	}
 	if ( $filterprofile <> "%" ) {
@@ -101,6 +78,6 @@
 }
 
 mysqli_free_result($sessionqry);
-//echo "<!-- End get_session.php at ".date("H:i:s", microtime(true))." -->\r\n";
+//echo "<!-- End get_sessions.php at ".date("H:i:s", microtime(true))." -->\r\n";
 
 ?>
diff --git a/web/merge_sessions.php b/web/merge_sessions.php
index 608fee7f..e5224112 100644
--- a/web/merge_sessions.php
+++ b/web/merge_sessions.php
@@ -44,6 +44,10 @@
     $newsessionsize = $mergerow['sessionsize'];
     mysqli_free_result($mergeqry);
 
+    $tableYear = date( "Y", $mergesession/1000 );
+    $tableMonth = date( "m", $mergesession/1000 );
+    $db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
+
     foreach ($sessionids as $value) {
         if ($value == $newsession) {
             $updatequery = "UPDATE $db_sessions_table SET timestart=$newtimestart, timeend=$newtimeend, sessionsize=$newsessionsize where session=$newsession";
@@ -51,7 +55,7 @@
         } else {
             $delquery = "DELETE FROM $db_sessions_table WHERE session = '$value'";
             mysqli_query($con, $delquery) or die(mysqli_error($con));
-            $updatequery = "UPDATE $db_table SET session=$newsession WHERE session=".quote_value($value);
+            $updatequery = "UPDATE $db_table_full SET session=$newsession WHERE session=".quote_value($value);
             mysqli_query($con, $updatequery) or die(mysqli_error($con));
         }
     }
diff --git a/web/pid_commit.php b/web/pid_commit.php
index 639c68e2..6f2d3c6b 100644
--- a/web/pid_commit.php
+++ b/web/pid_commit.php
@@ -14,10 +14,16 @@
     $split_data = explode(':', $field_id);
     $id = $split_data[1];
     $field_name = $split_data[0];
-echo "\nField Name: '$field_name'\nField ID: '$id'\nValue: '$val'\n";
-    if(!empty($id) && !empty($field_name) && !empty($val)) {
-      if($field_name == 'populated') {
-        if($val == 'true'){
+//echo "ID: '$id' Field Name: '$field_name' Field ID: '$id' Value: '$val'";
+    if (!empty($id) && !empty($field_name)) {
+      if ($field_name == 'populated') {
+        if ($val == 'true') {
+          $val=1;
+        } else {
+          $val=0;
+       }
+      } elseif ($field_name == 'favorite') {
+        if ($val == 'true') {
           $val=1;
         } else {
           $val=0;
@@ -25,12 +31,16 @@
       }
       //update the values
       $query = "UPDATE $db_name.$db_keys_table SET ".quote_name($field_name)." = ".quote_value($val)." WHERE id = ".quote_value($id);
-echo "\n$query\n";
-      mysqli_query($query) || die(mysqli_error($con));
+//echo "<br />$query<br />";
+      mysqli_query($con, $query) || die(mysqli_error($con));
       if($field_name == 'type') {
-      $query = "ALTER TABLE $db_name.$db_table MODIFY ".quote_name($id)." ".mysqli_real_escape_string($con, $val)." NOT NULL DEFAULT '0'";
-echo $query;
-        mysqli_query($query) || die(mysqli_error($con));
+        $table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
+        while( $row = mysqli_fetch_assoc($table_list) ) {
+          $db_table_name = $row["table_name"];
+          $query = "ALTER TABLE $db_name.$db_table_name MODIFY ".quote_name($id)." ".mysqli_real_escape_string($con, $val)." NOT NULL DEFAULT '0'";
+//echo "<br />$query<br />";
+          mysqli_query($con, $query) || die(mysqli_error($con));
+        }
       }
       echo "Updated";
     } else {
diff --git a/web/pid_edit.php b/web/pid_edit.php
index dac2f7b0..9b7b0889 100644
--- a/web/pid_edit.php
+++ b/web/pid_edit.php
@@ -7,11 +7,11 @@
 // 2015.08.21 - edit by surfrock66 - Rather than pull from the column comments,
 //   oull from a new database created which manages variables. Include
 //   a column flagging whether a variable is populated or not.
-$keyqry = mysqli_query($con, "SELECT id,description,units,type,min,max,populated FROM ".$db_name.".".$db_keys_table." ORDER BY description") or die(mysqli_error($con));
+$keyqry = mysqli_query($con, "SELECT id,description,units,type,min,max,populated,favorite FROM ".$db_name.".".$db_keys_table." ORDER BY description") or die(mysqli_error($con));
 $i = 0;
 while ($x = mysqli_fetch_array($keyqry)) {
 	if ((substr($x[0], 0, 1) == "k") ) {
-		$keydata[$i] = array("id"=>$x[0], "description"=>$x[1], "units"=>$x[2], "type"=>$x[3], "min"=>$x[4], "max"=>$x[5], "populated"=>$x[6]);
+		$keydata[$i] = array("id"=>$x[0], "description"=>$x[1], "units"=>$x[2], "type"=>$x[3], "min"=>$x[4], "max"=>$x[5], "populated"=>$x[6], "favorite"=>$x[7]);
 		$i = $i + 1;
 	}
 }
@@ -38,7 +38,7 @@
     <script language="javascript" type="text/javascript" src="static/js/jquery.peity.min.js"></script>
     <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/chosen/1.1.0/chosen.jquery.min.js"></script>
     <script language="javascript" type="text/javascript" src="static/js/torquehelpers.js"></script>
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
     <script>
       $(function(){
         var message_status = $("#status");
@@ -97,7 +97,8 @@
         <th>Variable Type</th>
         <th>Min Value</th>
         <th>Max Value</th>
-        <th>In Use?</th>
+        <th>Visible?</th>
+        <th>Favorite?</th>
       </thead>
       <tbody>
 <?php $i = 1; ?>
@@ -109,6 +110,7 @@
           <td>
             <select  id="type:<?php echo $keycol['id']; ?>" contenteditable="true">
               <!--<option value="boolean"<?php //if ($keycol['type'] == "boolean") echo ' selected'; ?>>boolean</option>-->
+              <option value="double"<?php if ($keycol['type'] == "double") echo ' selected'; ?>>double</option>
               <option value="float"<?php if ($keycol['type'] == "float") echo ' selected'; ?>>float</option>
               <option value="varchar(255)"<?php if ($keycol['type'] == "varchar(255)") echo ' selected'; ?>>varchar(255)</option>
             </selecT>
@@ -116,6 +118,7 @@
           <td id="min:<?php echo $keycol['id']; ?>" contenteditable="true"><?php echo $keycol['min']; ?></td>
           <td id="max:<?php echo $keycol['id']; ?>" contenteditable="true"><?php echo $keycol['max']; ?></td>
           <td><input type="checkbox" id="populated:<?php echo $keycol['id']; ?>" contenteditable="true"<?php if ( $keycol['populated'] ) echo " CHECKED"; ?>/></td>
+          <td><input type="checkbox" id="favorite:<?php echo $keycol['id']; ?>" contenteditable="true"<?php if ( $keycol['favorite'] ) echo " CHECKED"; ?>/></td>
         </tr>
 <?php   $i = $i + 1; ?>
 <?php } ?>
diff --git a/web/plot.php b/web/plot.php
index d0b22c4b..bc69ba00 100644
--- a/web/plot.php
+++ b/web/plot.php
@@ -55,7 +55,10 @@
 		$i = $i + 1;
 	}
 	// Get data for session
-	$sessionqry = mysqli_query($con, "SELECT $selectstring FROM $db_table WHERE session=".quote_value($session_id)." ORDER BY time DESC;") or die(mysqli_error($con));
+	$tableYear = date( "Y", $session_id/1000 );
+	$tableMonth = date( "m", $session_id/1000 );
+	$db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
+	$sessionqry = mysqli_query($con, "SELECT $selectstring FROM $db_table_full WHERE session=".quote_value($session_id)." ORDER BY time DESC;") or die(mysqli_error($con));
 	while($row = mysqli_fetch_assoc($sessionqry)) {
 	    $i = 1;
 		while (isset(${'v' . $i})) {
diff --git a/web/session.php b/web/session.php
index a56ba16e..fc08f7ca 100644
--- a/web/session.php
+++ b/web/session.php
@@ -26,19 +26,13 @@
   $session_id = preg_replace('/\D/', '', $_GET['id']);
 }
 
-// 2015.08.31 - edit by surfrock66 - Define and capture variables for maintaining
-//  the year and month filters between sessions.
-$filteryear = "";
-$filtermonth = "";
-if (isset($_GET["year"])) {
-  $filteryear = $_GET['year'];
-}
-if (isset($_GET["month"])) {
-  $filtermonth = $_GET['month'];
+// Define and capture variables for maintaining the year and month filters between sessions.
+$filteryearmonth = "";
+if (isset($_GET["yearmonth"])) {
+  $filteryearmonth = $_GET['yearmonth'];
 }
 
-// 2015.07.22 - edit by surfrock66 - Define some variables to be used in 
-//  variable management later, specifically when choosing default vars to plot
+// Define some variables to be used in variable management later, specifically when choosing default vars to plot
 $i=1;
 $var1 = "";
 while ( isset($_POST["s$i"]) || isset($_GET["s$i"]) ) {
@@ -65,8 +59,11 @@
   if($idx>0) {
     $session_id_next = $sids[$idx-1];
   }
+  $tableYear = date( "Y", $session_id/1000 );
+  $tableMonth = date( "m", $session_id/1000 );
+  $db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
   // Get GPS data for the currently selectedsession
-  $sessionqry = mysqli_query($con, "SELECT kff1006, kff1005 FROM $db_table
+  $sessionqry = mysqli_query($con, "SELECT kff1006, kff1005 FROM $db_table_full
               WHERE session=$session_id
               ORDER BY time DESC") or die(mysqli_error($con));
   $geolocs = array();
@@ -86,15 +83,16 @@
   // Don't need to set zoom manually
   $setZoomManually = 0;
 
-  // Query the list of years where sessions have been logged, to be used later
-  $yearquery = mysqli_query($con, "SELECT YEAR(FROM_UNIXTIME(session/1000)) as 'year'
-              FROM $db_sessions_table WHERE session <> ''
-              GROUP BY YEAR(FROM_UNIXTIME(session/1000)) 
-              ORDER BY YEAR(FROM_UNIXTIME(session/1000))") or die(mysqli_error($con));
-  $yeararray = array();
+  // Query the list of years and months where sessions have been logged, to be used later
+  $yearmonthquery = mysqli_query($con, "SELECT DISTINCT CONCAT(YEAR(FROM_UNIXTIME(session/1000)), '_', DATE_FORMAT(FROM_UNIXTIME(session/1000),'%m')) as Suffix, 
+		CONCAT(MONTHNAME(FROM_UNIXTIME(session/1000)), ' ', YEAR(FROM_UNIXTIME(session/1000))) as Description 
+		FROM $db_sessions_table ORDER BY Suffix DESC") or die(mysqli_error($con));
+  $yearmonthsuffixarray = array();
+  $yearmonthdescarray = array();
   $i = 0;
-  while($row = mysqli_fetch_assoc($yearquery)) {
-    $yeararray[$i] = $row['year'];
+  while($row = mysqli_fetch_assoc($yearmonthquery)) {
+    $yearmonthsuffixarray[$i] = $row['Suffix'];
+    $yearmonthdescarray[$i] = $row['Description'];
     $i = $i + 1;
   }
 
@@ -322,7 +320,7 @@ function doPlot(position) {
             <table width="100%">
               <tr>
                 <!-- Profile Filter -->
-                <td width="22%">
+                <td width="34%">
                   <select id="selprofile" name="selprofile" class="form-control chosen-select" data-placeholder="Select Profile">
                     <option value=""></option>
                     <option value="ALL"<?php if ($filterprofile == "ALL") echo ' selected'; ?>>Any Profile</option>
@@ -334,38 +332,19 @@ function doPlot(position) {
                   </select>
                 </td>
                 <td width="2%"></td>
-                <!-- Year Filter -->
-                <td width="22%">
-                  <select id="selyear" name="selyear" class="form-control chosen-select" data-placeholder="Select Year">
+
+                <!-- Year Month Filter -->
+                <td width="34%">
+                  <select id="selyearmonth" name="selyearmonth" class="form-control chosen-select" data-placeholder="Select Year/Month">
                     <option value=""></option>
-                    <option value="ALL"<?php if ($filteryear == "ALL") echo ' selected'; ?>>Any Year</option>
 <?php $i = 0; ?>
-<?php while(isset($yeararray[$i])) { ?>
-                    <option value="<?php echo $yeararray[$i]; ?>"<?php if ($filteryear == $yeararray[$i]) echo ' selected'; ?>><?php echo $yeararray[$i]; ?></option>
+<?php while(isset($yearmonthsuffixarray[$i])) { ?>
+                    <option value="<?php echo $yearmonthsuffixarray[$i]; ?>"<?php if ($filteryearmonth == $yearmonthsuffixarray[$i]) { echo ' selected'; } else if ($i == 0) { echo 'selected'; } ?>><?php echo $yearmonthdescarray[$i]; ?></option>
 <?php   $i = $i + 1; ?>
 <?php } ?>
                   </select>
                 </td>
-                <td width="2%"></td>
-                <!-- Month Filter -->
-                <td width="22%">
-                  <select id="selmonth" name="selmonth" class="form-control chosen-select" data-placeholder="Select Month">
-                    <option value=""></option>
-                    <option value="ALL"<?php if ($filtermonth == "ALL") echo ' selected'; ?>>Any Month</option>
-                    <option value="January"<?php if ($filtermonth == "January") echo ' selected'; ?>>January</option>
-                    <option value="February"<?php if ($filtermonth == "February") echo ' selected'; ?>>February</option>
-                    <option value="March"<?php if ($filtermonth == "March") echo ' selected'; ?>>March</option>
-                    <option value="April"<?php if ($filtermonth == "April") echo ' selected'; ?>>April</option>
-                    <option value="May"<?php if ($filtermonth == "May") echo ' selected'; ?>>May</option>
-                    <option value="June"<?php if ($filtermonth == "June") echo ' selected'; ?>>June</option>
-                    <option value="July"<?php if ($filtermonth == "July") echo ' selected'; ?>>July</option>
-                    <option value="August"<?php if ($filtermonth == "August") echo ' selected'; ?>>August</option>
-                    <option value="September"<?php if ($filtermonth == "September") echo ' selected'; ?>>September</option>
-                    <option value="October"<?php if ($filtermonth == "October") echo ' selected'; ?>>October</option>
-                    <option value="November"<?php if ($filtermonth == "November") echo ' selected'; ?>>November</option>
-                    <option value="December"<?php if ($filtermonth == "December") echo ' selected'; ?>>December</option>
-                  </select>
-                </td>
+
                 <td width="13%">
                   <div align="center" style="padding-top:2px;"><input class="btn btn-info btn-sm" type="submit" id="formfilterdates" name="filterdates" value="Filter Sessions"></div>
                 </td>
@@ -381,11 +360,8 @@ function doPlot(position) {
               <option value="<?php echo $dateid; ?>"<?php if ($dateid == $session_id) echo ' selected'; ?>><?php echo $datestr; echo $seshprofile[$dateid]; if ($show_session_length) {echo $seshsizes[$dateid];} ?><?php if ($dateid == $session_id) echo ' (Current Session)'; ?></option>
 <?php } ?>
             </select>
-<?php   if ( $filteryear <> "" ) { ?>
-            <input type="hidden" name="selyear" id="selyear" value="<?php echo $filteryear; ?>" />
-<?php   } ?>
-<?php   if ( $filtermonth <> "" ) { ?>
-            <input type="hidden" name="selmonth" id="selmonth" value="<?php echo $filtermonth; ?>" />
+<?php   if ( $filteryearmonth <> "" ) { ?>
+            <input type="hidden" name="selyearmonth" id="selyearmonth" value="<?php echo $filteryearmonth; ?>" />
 <?php   } ?>
             <noscript><input type="submit" id="seshidtag" name="seshidtag" class="input-sm"></noscript>
           </form>
@@ -423,14 +399,11 @@ function doPlot(position) {
               <select data-placeholder="Choose OBD2 data..." multiple class="chosen-select" size="<?php echo $numcols; ?>" style="width:100%;" id="plot_data" onsubmit="onSubmitIt" name="plotdata[]">
                 <option value=""></option>
 <?php   foreach ($coldata as $xcol) { ?>
-                <option value="<?php echo $xcol['colname']; ?>" <?php $i = 1; while ( isset(${'var' . $i}) ) { if ( ${'var' . $i} == $xcol['colname'] ) { echo " selected"; } $i = $i + 1; } ?>><?php echo $xcol['colcomment']; ?></option>
+                <option value="<?php echo $xcol['colname']; ?>" <?php $i = 1; while ( isset(${'var' . $i}) ) { if ( (${'var' . $i} == $xcol['colname'] ) OR ( $xcol['colfavorite'] == 1 ) ) { echo " selected"; } $i = $i + 1; } ?>><?php echo $xcol['colcomment']; ?></option>
 <?php   } ?>
             </select>
-<?php   if ( $filteryear <> "" ) { ?>
-            <input type="hidden" name="selyear" id="selyear" value="<?php echo $filteryear; ?>" />
-<?php   } ?>
-<?php   if ( $filtermonth <> "" ) { ?>
-            <input type="hidden" name="selmonth" id="selmonth" value="<?php echo $filtermonth; ?>" />
+<?php   if ( $filteryearmonth <> "" ) { ?>
+            <input type="hidden" name="selyearmonth" id="selyearmonth" value="<?php echo $filteryearmonth; ?>" />
 <?php   } ?>
             <div align="center" style="padding-top:6px;"><input class="btn btn-info btn-sm" type="submit" id="formplotdata" name="plotdata[]" value="Plot!"></div>
           </form>
diff --git a/web/static/css/torque.css b/web/static/css/torque.css
index 63ee0fd6..5ce1ec19 100644
--- a/web/static/css/torque.css
+++ b/web/static/css/torque.css
@@ -54,7 +54,7 @@ html,body {
     font-size: 80%;
 }
 
-#seshidtag_chosen #selyear_chosen #selmonth_chosen #selprofile_chosen {
+#seshidtag_chosen #selyear_chosen #selmonth_chosen #selprofile_chosen #selyearmonth_chosen {
     font-size: 15px;
 }
 
diff --git a/web/static/js/torquehelpers.js b/web/static/js/torquehelpers.js
index e2c84743..022b2996 100644
--- a/web/static/js/torquehelpers.js
+++ b/web/static/js/torquehelpers.js
@@ -66,14 +66,12 @@ $(document).ready(function(){
   // Activate Chosen on the selection drop down
   $("select#seshidtag").chosen({width: "100%"});
   $("select#selprofile").chosen({width: "100%", disable_search: true, allow_single_deselect: true});
-  $("select#selyear").chosen({width: "100%", disable_search: true, allow_single_deselect: true});
-  $("select#selmonth").chosen({width: "100%", disable_search: true, allow_single_deselect: true});
+  $("select#selyearmonth").chosen({width: "100%", disable_search: true, allow_single_deselect: true});
   $("select#plot_data").chosen({width: "100%"});
   // Center the selected element
   $("div#seshidtag_chosen a.chosen-single span").attr('align', 'center');
   $("div#selprofile_chosen a.chosen-single span").attr('align', 'center');
-  $("div#selyear_chosen a.chosen-single span").attr('align', 'center');
-  $("div#selmonth_chosen a.chosen-single span").attr('align', 'center');
+  $("div#selyearmonth_chosen a.chosen-single span").attr('align', 'center');
   $("select#plot_data").chosen({no_results_text: "Oops, nothing found!"});
   $("select#plot_data").chosen({placeholder_text_multiple: "Choose OBD2 data.."});
   // When the selection drop down is open, force all elements to align left with padding
@@ -81,10 +79,8 @@ $(document).ready(function(){
   $('select#seshidtag').on('chosen:showing_dropdown', function() { $('li.active-result').css('padding-left', '20px');});
   $('select#selprofile').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
   $('select#selprofile').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
-  $('select#selyear').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
-  $('select#selyear').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
-  $('select#selmonth').on('chosen:showing_dropdown', function() { $('li.active-result').css('padding-left', '20px');});
-  $('select#selmonth').on('chosen:showing_dropdown', function() { $('li.active-result').css('padding-left', '20px');});
+  $('select#selyearmonth').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
+  $('select#selyearmonth').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
   $('select#plot_data').on('chosen:showing_dropdown', function() { $('li.active-result').attr('align', 'left');});
   $('select#plot_data').on('chosen:showing_dropdown', function() { $('li.active-result').css('padding-left', '20px');});
 });
diff --git a/web/upload_data.php b/web/upload_data.php
index 86ad6c06..e40cc6dc 100755
--- a/web/upload_data.php
+++ b/web/upload_data.php
@@ -2,29 +2,69 @@
 require_once ('db.php');
 require_once ('auth_app.php');
 
-
+$newest_table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC LIMIT 1;");
+$newest_table = "";
+while( $row = mysqli_fetch_assoc($newest_table_list) ) {
+  $newest_table = $row["table_name"];
+}
 // Create an array of all the existing fields in the database
-$result = mysqli_query($con, "SHOW COLUMNS FROM $db_table") or die(mysqli_error($con));
+$result = mysqli_query($con, "SHOW COLUMNS FROM $newest_table") or die(mysqli_error($con));
 if (mysqli_num_rows($result) > 0) {
   while ($row = mysqli_fetch_assoc($result)) {
     $dbfields[]=($row['Field']);
   }
 }
-
 // Iterate over all the k* _GET arguments to check that a field exists
 if (sizeof($_GET) > 0) {
   $keys = array();
   $values = array();
   $sesskeys = array();
   $sessvalues = array();
-  $sessprofilekeys = array();
-  $sessprofilevalues = array();
+  $datakeys = array();
+  $datavalues = array();
   $sessuploadid = "";
   $sesstime = "0";
-  $sessprofilequery = "";
-//print_r($_GET);
+  $sessprofilename = "";
+  $sessprofilefueltype = "";
+  $sessprofileweight = "0";
+  $sessprofileve = "0";
+  $sessprofilefuelcost = "0";
+  // From the sessionID, extrapolate the year and month so you can name the correct table from the prefix
+  $session_id = $_GET["session"];
+  $tableYear = date( "Y", $session_id/1000 );
+  $tableMonth = date( "m", $session_id/1000 );
+  $db_table_full = "{$db_table}_{$tableYear}_{$tableMonth}";
+  // If the desired table name doesn't exist, create it copying columns from the previous month's table
+  $current_table_list_query = "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name = '$db_table_full'";
+#echo :<br />Debug -04 $current_table_list_query<br />";
+  $current_table_list = mysqli_query($con, $current_table_list_query);
+#echo "<br />Debug -03<br />";
+  if ( ! mysqli_fetch_assoc($current_table_list) ) {
+#echo "<br />Debug -02<br />";
+    mysqli_query($con, "CREATE TABLE $db_table_full SELECT * FROM $newest_table WHERE 1=0") or die(mysqli_error($con));
+  }
+#echo "<br />Debug -01<br />";
   foreach ($_GET as $key => $value) {
-    if (preg_match("/^k/", $key)) {
+    // We will operate on 5 data sets which are defined by 5 "submit values"
+    //   0 = Data we aren't dealing with, do nothing
+    //   1 = Session data; Any value higher than this requires an entry in the sessions table
+    //   2 = Data; There is a column check, then the data is added to the raw table
+    //   3 = Profile data; Update the profile data to the sessions table
+    //   4 = Notice data; Alert/event data...I'm doing nothing with this yet
+    if (in_array($key, array("v", "eml", "time", "id", "session"))) {
+#echo "<br />Debug 00<br />";
+      // Keep non k*,  non profile, and non notice columns listed here
+      if ($key == 'session') {
+        $sessuploadid = $value;
+      }
+      if ($key == 'time') {
+        $sesstime = $value;
+      }
+      $sesskeys[] = $key;
+      $sessvalues[] = $value;
+      $submitval = 1;
+    } else if (preg_match("/^k/", $key)) {
+#echo "<br />Debug 03 $key<br />";
       // Keep columns starting with k
       $keys[] = $key;
       // My Torque app tries to pass "Infinity" in for some values...catch that error, set to -1
@@ -33,42 +73,69 @@
       } else {
         $values[] = $value;
       }
-      $submitval = 1;
-    } else if (in_array($key, array("v", "eml", "time", "id", "session"))) {
-      // Keep non k* columns listed here
-      if ($key == 'session') {
-        $sessuploadid = $value;
+      $submitval = 2;
+    } else if (preg_match("/^profile/", $key)) {
+#echo "<br />Debug 06 $key<br />";
+      if ($key == 'profileName') {
+        $sessprofilename = $value;
       }
-      if ($key == 'time') {
-        $sesstime = $value;
+#echo "<br />Debug 07 $sessprofilename<br />";
+      if ($key == 'profileFuelType') {
+        $sessprofilefueltype = $value;
       }
-      $sesskeys[] = $key;
-      $sessvalues[] = $value;
-      $submitval = 1;
+#echo "<br />Debug 08 $sessprofilefueltype<br />";
+      if ($key == 'profileWeight') {
+        $sessprofileweight = $value;
+      }
+#echo "<br />Debug 09 $sessprofileweight<br />";
+      if ($key == 'profileVe') {
+        $sessprofileve = $value;
+      }
+#echo "<br />Debug 10 $sessprofileve<br />";
+      if ($key == 'profileFuelCost') {
+        $sessprofilefuelcost = $value;
+      }
+#echo "<br />Debug 11 $sessprofilefuelcost<br />";
+      $submitval = 3;
     } else if (in_array($key, array("notice", "noticeClass"))) {
+#echo "<br />Debug 12<br />";
       $keys[] = $key;
       $values[] = $value;
-      $submitval = 1;
-    } else if (preg_match("/^profile/", $key)) {
-      $sessprofilequery = $sessprofilequery.", ".quote_name($key)."=".quote_value($value);
-      $sessprofilekeys[] = $key;
-      $sessprofilevalues[] = $value;
-      $submitval = 1;
+      $submitval = 4;
     } else {
       $submitval = 0;
     }
-    // If the field doesn't already exist, add it to the database
-    if (!in_array($key, $dbfields) and $submitval == 1) {
-      if ( is_float($value) ) {
-        // Add field if it's a float
-        $sqlalter = "ALTER TABLE $db_table ADD ".quote_name($key)." float NOT NULL default '0'";
-        $sqlalterkey = "INSERT INTO $db_keys_table (id, description, type, populated) VALUES (".quote_value($key).", ".quote_value($key).", 'float', '1')";
-      } else {
-        // Add field if it's a string, specifically varchar(255)
-        $sqlalter = "ALTER TABLE $db_table ADD ".quote_name($key)." VARCHAR(255) NOT NULL default 'Not Specified'";
-        $sqlalterkey = "INSERT INTO $db_keys_table (id, description, type, populated) VALUES (".quote_value($key).", ".quote_value($key).", 'varchar(255)', '1')";
+    // If the field is a data field and doesn't already exist, add it to the database
+    if (!in_array($key, $dbfields) and $submitval == 2) {
+      // If the value isn't already in the latest DB table, we better check every DB table
+      $table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
+      while( $row = mysqli_fetch_assoc($table_list) ) {
+        $db_table_name = $row["table_name"];
+        // Create an array of all the existing fields in the database
+        $result = mysqli_query($con, "SHOW COLUMNS FROM $db_table_name") or die(mysqli_error($con));
+        if (mysqli_num_rows($result) > 0) {
+          while ($row = mysqli_fetch_assoc($result)) {
+            $dbfields_per_table[]=($row['Field']);
+          }
+        }
+        if (!in_array($key, $dbfields_per_table) and $submitval == 1) {
+          // In PHP float and double are the same, so start with float as a default
+          if ( is_float($value) ) {
+            // Add field if it's a float to EVERY raw values table
+            $sqlalter = "ALTER TABLE $db_table_name ADD ".quote_name($key)." float NOT NULL default '0'";
+          } else {
+            // Add field if it's a string to EVERY raw values table, specifically varchar(255)
+            $sqlalter = "ALTER TABLE $db_table_name ADD ".quote_name($key)." VARCHAR(255) NOT NULL default 'Not Specified'";
+          }
+          mysqli_query($con, $sqlalter) or die(mysqli_error($con));
+        }
       }
-      mysqli_query($con, $sqlalter) or die(mysqli_error($con));
+    }
+    $sqlkeyquery = "SELECT id FROM $db_keys_table WHERE id=".quote_value($key);
+    $result = mysqli_query($con, $sqlkeyquery);
+    $row = mysqli_fetch_assoc($result);
+    if ( ! $row and $submitval == 2 ) {
+      $sqlalterkey = "INSERT INTO $db_keys_table (id, description, type, populated) VALUES (".quote_value($key).", ".quote_value($key).", 'varchar(255)', '1')";
       mysqli_query($con, $sqlalterkey) or die(mysqli_error($con));
     }
   }
@@ -76,27 +143,69 @@
   //  so huge, and has so much repeating data. This is my attempt to flatten the redundant data into the
   //  sessions table; this code checks if there is already a row for the current session, and if there is, only 
   //  update the ending time and the count of datapoints.  If there isn't a row, insert one.
-  $rawkeys = array_merge($keys, $sesskeys, $sessprofilekeys);
-  $rawvalues = array_merge($values, $sessvalues, $sessprofilevalues);
-  if ((sizeof($rawkeys) === sizeof($rawvalues)) && sizeof($rawkeys) > 0 && (sizeof($sesskeys) === sizeof($sessvalues)) && sizeof($sesskeys) > 0) {
+
+  // No matter what, if the submitval is higher than 0, make sure a session exists.  
+  //   If one doesn't, create an entry.  If one does, collect current values
+  if ( $submitval >= 1 && (sizeof($sesskeys) === sizeof($sessvalues)) && sizeof($sesskeys) > 0 ) {
+#echo "<br />Debug 20<br />";
+    $sessionqrystring = "SELECT session, timestart, timeend, sessionsize FROM $db_sessions_table WHERE session LIKE ".quote_value($sessuploadid);
+#echo "<br />Debug 21 $sessionqrystring<br />";
+    $sessionqry = mysqli_query($con, $sessionqrystring) or die(mysqli_error($con));
+    $row = mysqli_fetch_assoc($sessionqry);
+    if ( ! $row ) {
+#echo "<br />Debug 23<br />";
+      $sessioninsertstring = "INSERT INTO $db_sessions_table (".quote_names($sesskeys).", timestart, sessionsize) VALUES (".quote_values($sessvalues).", $sesstime, '1')";
+#echo "<br />Debug 24 $sessioninsertstring<br />";
+      mysqli_query($con, $sessioninsertstring) or die(mysqli_error($con));
+    } else {
+#echo "<br />Debug 26<br />";
+      $sessTimeStart = $row['timestart'];
+      $sessTimeEnd = $row['timeend'];
+      $sessSize = $row['sessionsize'];
+    }
+  }
+  // Prepare for inserting a value into the full data table
+#  $datakeys = array_merge($keys, 'session', 'time');
+#  $datavalues = array_merge($values, $sessuploadid, $sesstime);
+  $datakeys = $keys;
+  $datavalues = $values;
+  $datakeys[] = 'session';
+  $datavalues[] = $sessuploadid;
+  $datakeys[] = 'time';
+  $datavalues[] = $sesstime; 
+#echo "<br />Debug 29 $submitval ".sizeof($datakeys)." ".sizeof($datavalues)."<br />";
+  if ( $submitval == 2 && ( sizeof($datakeys) === sizeof($datavalues) ) && sizeof($datakeys) > 0 ) {
+#echo "<br />Debug 30<br />";
     // Now insert the data for all the fields into the raw logs table
-    $sql = "INSERT INTO $db_table (".quote_names($rawkeys).") VALUES (".quote_values($rawvalues).")";
-//echo $sql;
+    $sql = "INSERT INTO $db_table_full (".quote_names($datakeys).") VALUES (".quote_values($datavalues).")";
+#echo "<br />Debug 31 $sql<br />";
     mysqli_query($con, $sql) or die(mysqli_error($con));
-    // See if there is already an entry in the sessions table for this session
-    $sessionqry = mysqli_query($con, "SELECT session, sessionsize FROM $db_sessions_table WHERE session LIKE ".quote_value($sessuploadid)) or die(mysqli_error($con));
-    $sesssizecount=1;
-    // If there's an entry in the session table for this session, update the session end time and the datapoint count
-    while($row = mysqli_fetch_assoc($sessionqry)) {
-      $sesssizecount = $row["sessionsize"] + 1;
+    // Update session variables
+    // If this is the earliest timestamp for this session, update the "Session start time"
+    if ( $sessTimeStart > $sesstime ) {
+      $sessTimeStart = $sesstime;
     }
-    $sessionqrystring = "INSERT INTO $db_sessions_table (".quote_names($sesskeys).", timestart, sessionsize) VALUES (".quote_values($sessvalues).", $sesstime, '1') ON DUPLICATE KEY UPDATE timeend='$sesstime', sessionsize='$sesssizecount'$sessprofilequery";
-//echo $sessionqrystring;
-    mysqli_query($con, $sessionqrystring) or die(mysqli_error($con));
+    // If this is the latest timestamp for this session, update the "Session end time"
+    if ( $sessTimeEnd < $sesstime ) {
+      $sessTimeEnd = $sesstime;
+    }
+    // Increment the session size counter
+    $sessSize = $sessSize + 1;
+    // Update the session table
+    $dataqrystring = "UPDATE $db_sessions_table SET timestart = ".quote_value($sessTimeStart).", timeend = ".quote_value($sessTimeEnd).", sessionsize = ".quote_value($sessSize)." WHERE session = ".quote_value($sessuploadid);
+#echo "<br />Debug 39 $dataqrystring<br />";
+    mysqli_query($con, $dataqrystring) or die(mysqli_error($con));
+  }
+  if ( $submitval == 3 ) {
+#echo "<br />Debug 40<br />";
+    $profileqrystring = "UPDATE $db_sessions_table SET profileName = ".quote_value($sessprofilename).", profileFuelType = ".quote_value($sessprofilefueltype).", profileWeight = ".quote_value($sessprofileweight).", profileVe = ".quote_value($sessprofileve).", profileFuelCost = ".quote_value($sessprofilefuelcost)." WHERE session = ".quote_value($sessuploadid);
+#echo "<br />Debug 41 $profileqrystring<br />";
+    mysqli_query($con, $profileqrystring) or die(mysqli_error($con));
   }
 }
 mysqli_close($con);
 
 // Return the response required by Torque
+#echo "<br />OK!<br />";
 echo "OK!";
 ?>
diff --git a/web/url.php b/web/url.php
index 6481a3be..51fb77d4 100644
--- a/web/url.php
+++ b/web/url.php
@@ -32,25 +32,14 @@
 	}
 }
 
-// Capture the year we will be working with
-if (isset($_POST["selyear"])) {
-	if ($_POST["selyear"]) {
-		$outurl = $outurl."&year=".$_POST["selyear"];
+// Capture the year/month we will be working with
+if (isset($_POST["selyearmonth"])) {
+	if ($_POST["selyearmonth"]) {
+		$outurl = $outurl."&yearmonth=".$_POST["selyearmonth"];
 	}
-} elseif (isset($_GET["year"])) {
-	if ($_GET["year"]) {
-		$outurl = $outurl."&year=".$_GET["year"];
-	}
-}
-
-//Capture the month we will be working with
-if (isset($_POST["selmonth"])) {
-	if ($_POST["selmonth"] <> "") {
-		$outurl = $outurl."&month=".$_POST["selmonth"];
-	}
-} elseif (isset($_GET["month"])) {
-	if ($_GET["month"]) {
-		$outurl = $outurl."&month=".$_GET["month"]; 
+} elseif (isset($_GET["yearmonth"])) {
+	if ($_GET["yearmonth"]) {
+		$outurl = $outurl."&yearmonth=".$_GET["yearmonth"];
 	}
 }