diff --git a/.gitignore b/.gitignore
index a54c7ec4f..4fcbc57e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 bower_components/
 node_modules/
 
+
+bundle/bundle.out.js
+
 .idea/
 *.iml
 my.env
diff --git a/bundle/bundle.source.js b/bundle/bundle.source.js
new file mode 100644
index 000000000..e9c8f6e8d
--- /dev/null
+++ b/bundle/bundle.source.js
@@ -0,0 +1,12 @@
+(function () {
+
+    window.Nightscout = window.Nightscout || {};
+
+    window.Nightscout = {
+        iob: require('../lib/iob')()
+    };
+
+    console.info("Nightscout bundle ready", window.Nightscout);
+
+})();
+
diff --git a/bundle/index.js b/bundle/index.js
new file mode 100644
index 000000000..5ea7ff424
--- /dev/null
+++ b/bundle/index.js
@@ -0,0 +1,17 @@
+'use strict';
+
+var browserify_express = require('browserify-express');
+
+function bundle() {
+  return browserify_express({
+    entry: __dirname + '/bundle.source.js',
+    watch: [__dirname + '../lib/', __dirname + '/bundle.source.js'],
+    mount: '/public/js/bundle.js',
+    verbose: true,
+    //minify: true,
+    bundle_opts: { debug: true }, // enable inline sourcemap on js files
+    write_file: __dirname + '/bundle.out.js'
+  });
+}
+
+module.exports = bundle;
\ No newline at end of file
diff --git a/env.js b/env.js
index 0218d6963..c063c2274 100644
--- a/env.js
+++ b/env.js
@@ -41,6 +41,7 @@ function config ( ) {
   env.mongo_collection = readENV('MONGO_COLLECTION', 'entries');
   env.settings_collection = readENV('MONGO_SETTINGS_COLLECTION', 'settings');
   env.treatments_collection = readENV('MONGO_TREATMENTS_COLLECTION', 'treatments');
+  env.profile_collection = readENV('MONGO_PROFILE_COLLECTION', 'profile');
   env.devicestatus_collection = readENV('MONGO_DEVICESTATUS_COLLECTION', 'devicestatus');
 
   env.enable = readENV('ENABLE');
diff --git a/lib/api/index.js b/lib/api/index.js
index 13ccb4c57..994306139 100644
--- a/lib/api/index.js
+++ b/lib/api/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-function create (env, entries, settings, treatments, devicestatus) {
+function create (env, entries, settings, treatments, profile, devicestatus) {
   var express = require('express'),
       app = express( )
   ;
@@ -47,6 +47,7 @@ function create (env, entries, settings, treatments, devicestatus) {
   app.use('/', require('./entries/')(app, wares, entries));
   app.use('/', require('./settings/')(app, wares, settings));
   app.use('/', require('./treatments/')(app, wares, treatments));
+  app.use('/', require('./profile/')(app, wares, profile));
   app.use('/', require('./devicestatus/')(app, wares, devicestatus));
 
   // Status
diff --git a/lib/api/profile/index.js b/lib/api/profile/index.js
new file mode 100644
index 000000000..5dae6a971
--- /dev/null
+++ b/lib/api/profile/index.js
@@ -0,0 +1,29 @@
+'use strict';
+
+var consts = require('../../constants');
+
+function configure (app, wares, profile) {
+    var express = require('express'),
+        api = express.Router( );
+
+    // invoke common middleware
+    api.use(wares.sendJSONStatus);
+    // text body types get handled as raw buffer stream
+    api.use(wares.bodyParser.raw( ));
+    // json body types get handled as parsed json
+    api.use(wares.bodyParser.json( ));
+    // also support url-encoded content-type
+    api.use(wares.bodyParser.urlencoded({ extended: true }));
+
+    // List settings available
+    api.get('/profile/', function(req, res) {
+        profile.list(function (err, attribute) {
+            return res.json(attribute);
+        });
+    });
+
+    return api;
+}
+
+module.exports = configure;
+
diff --git a/lib/iob.js b/lib/iob.js
new file mode 100644
index 000000000..b4800f133
--- /dev/null
+++ b/lib/iob.js
@@ -0,0 +1,80 @@
+'use strict';
+
+function calcTotal(treatments, profile, time) {
+
+  console.info("trying to calc");
+
+  var iob = 0
+    , activity = 0;
+
+  if (!treatments) return {};
+
+  if (profile === undefined) {
+    //if there is no profile default to 3 hour dia
+    profile = {dia: 3, sens: 0};
+  }
+
+  if (time === undefined) {
+    time = new Date();
+  }
+
+  treatments.forEach(function (treatment) {
+    if (new Date(treatment.created_at) < time) {
+      var tIOB = calcTreatment(treatment, profile, time);
+      if (tIOB && tIOB.iobContrib) iob += tIOB.iobContrib;
+      if (tIOB && tIOB.activityContrib) activity += tIOB.activityContrib;
+    }
+  });
+
+  return {
+    iob: iob,
+    display: iob.toFixed(2),
+    activity: activity
+  };
+}
+
+function calcTreatment(treatment, profile, time) {
+
+  var dia = profile.dia
+    , scaleFactor = 3.0 / dia
+    , peak = 75
+    , sens = profile.sens
+    , iobContrib = 0
+    , activityContrib = 0;
+
+  if (treatment.insulin) {
+    var bolusTime = new Date(treatment.created_at);
+    var minAgo = scaleFactor * (time - bolusTime) / 1000 / 60;
+
+    if (minAgo < peak) {
+      var x = minAgo / 5 + 1;
+      iobContrib = treatment.insulin * (1 - 0.001852 * x * x + 0.001852 * x);
+      activityContrib = sens * treatment.insulin * (2 / dia / 60 / peak) * minAgo;
+
+    } else if (minAgo < 180) {
+      var x = (minAgo - 75) / 5;
+      iobContrib = treatment.insulin * (0.001323 * x * x - .054233 * x + .55556);
+      activityContrib = sens * treatment.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak));
+    } else {
+      iobContrib = 0;
+      activityContrib = 0;
+    }
+
+  }
+
+  return {
+    iobContrib: iobContrib,
+    activityContrib: activityContrib
+  };
+
+}
+
+function IOB(opts) {
+
+  return {
+    calcTotal: calcTotal
+  };
+
+}
+
+module.exports = IOB;
\ No newline at end of file
diff --git a/lib/pebble.js b/lib/pebble.js
index 7f5e8e64a..d918de564 100644
--- a/lib/pebble.js
+++ b/lib/pebble.js
@@ -11,6 +11,8 @@ var DIRECTIONS = {
 , 'RATE OUT OF RANGE': 9
 };
 
+var iob = require("./iob")();
+
 function directionToTrend (direction) {
   var trend = 8;
   if (direction in DIRECTIONS) {
@@ -23,6 +25,8 @@ function pebble (req, res) {
   var ONE_DAY = 24 * 60 * 60 * 1000;
   var useMetricBg = (req.query.units === "mmol");
   var uploaderBattery;
+  var treatmentResults;
+  var profileResult;
 
   function scaleBg(bg) {
       if (useMetricBg) {
@@ -74,8 +78,11 @@ function pebble (req, res) {
     var count = parseInt(req.query.count) || 1;
 
     var bgs = sgvData.slice(0, count);
-    //for compatibility we're keeping battery here, but it would be better somewhere else
+    //for compatibility we're keeping battery and iob here, but they would be better somewhere else
     bgs[0].battery = uploaderBattery ? "" + uploaderBattery : undefined;
+    if (req.iob) {
+        bgs[0].iob = iob.calcTotal(treatmentResults.slice(0, 20), profileResult, new Date(now)).display;
+    }
 
     var result = { status: [ {now:now}], bgs: bgs, cals: calData.slice(0, count) };
     res.setHeader('content-type', 'application/json');
@@ -91,15 +98,48 @@ function pebble (req, res) {
       }
 
       var earliest_data = Date.now() - ONE_DAY;
-      var q = { find: {"date": {"$gte": earliest_data}} };
-      req.entries.list(q, get_latest);
+      loadTreatments(req, earliest_data, function (err, trs) {
+        treatmentResults = trs;
+          loadProfile(req, function (err, profileResults) {
+            profileResults.forEach(function(profile) {
+              if (profile) {
+                if (profile.dia) {
+                  profileResult = profile;
+                }
+              }
+            });
+            var q = { find: {"date": {"$gte": earliest_data}} };
+            req.entries.list(q, get_latest);
+          });
+      });
   });
 }
-function configure (entries, devicestatus, env) {
+
+function loadTreatments(req, earliest_data, fn) {
+  if (req.iob) {
+    var q = { find: {"created_at": {"$gte": new Date(earliest_data).toISOString()}} };
+    req.treatments.list(q, fn);
+  } else {
+    fn(null, []);
+  }
+}
+
+function loadProfile(req, fn) {
+  if (req.iob) {
+    req.profile.list(fn);
+  } else {
+    fn(null, []);
+  }
+}
+
+function configure (entries, treatments, profile, devicestatus, env) {
   function middle (req, res, next) {
     req.entries = entries;
+    req.treatments = treatments;
+    req.profile = profile;
     req.devicestatus = devicestatus;
     req.rawbg = env.enable && env.enable.indexOf('rawbg') > -1;
+    req.iob = env.enable && env.enable.indexOf('iob') > -1;
     next( );
   }
   return [middle, pebble];
diff --git a/lib/profile.js b/lib/profile.js
new file mode 100644
index 000000000..c7ba0e101
--- /dev/null
+++ b/lib/profile.js
@@ -0,0 +1,24 @@
+'use strict';
+
+function configure (collection, storage) {
+
+  function create (obj, fn) {
+    obj.created_at = (new Date( )).toISOString( );
+    api( ).insert(obj, function (err, doc) {
+      fn(null, doc);
+    });
+  }
+
+  function list (fn) {
+    return api( ).find({ }).sort({created_at: -1}).toArray(fn);
+  }
+
+  function api ( ) {
+    return storage.pool.db.collection(collection);
+  }
+
+  api.list = list;
+  api.create = create;
+  return api;
+}
+module.exports = configure;
diff --git a/lib/websocket.js b/lib/websocket.js
index 49d10bedb..6936ef173 100644
--- a/lib/websocket.js
+++ b/lib/websocket.js
@@ -1,5 +1,5 @@
 
-function websocket (env, server, entries, treatments) {
+function websocket (env, server, entries, treatments, profiles) {
 "use strict";
 // CONSTANTS
 var ONE_HOUR = 3600000,
@@ -29,6 +29,7 @@ var dir2Char = {
     treatmentData = [],
     mbgData = [],
     calData = [],
+    profileData = [],
     patientData = [];
 
   function start ( ) {
@@ -146,6 +147,7 @@ function update() {
     cgmData = [];
     treatmentData = [];
     mbgData = [];
+    profileData = [];
     var earliest_data = now - TWO_DAYS;
     var q = { find: {"date": {"$gte": earliest_data}} };
     entries.list(q, function (err, results) {
@@ -188,8 +190,19 @@ function update() {
               treatment.x = timestamp.getTime();
               return treatment;
           });
-          // all done, do loadData
-          loadData( );
+
+          profiles.list(function (err, results) {
+              // There should be only one document in the profile collection with a DIA.  If there are multiple, use the last one.
+              results.forEach(function(element, index, array) {
+                  if (element) {
+                    if (element.dia) {
+                        profileData[0] = element;
+                    }
+                  }
+              });
+              // all done, do loadData
+              loadData( );
+          });
       });
     });
 
@@ -237,6 +250,10 @@ function loadData() {
         });
     }
 
+    if (profileData) {
+        var profile = profileData;
+    }
+
     if (actualCurrent && actualCurrent < 39) errorCode = actualCurrent;
 
     var actualLength = actual.length - 1;
@@ -271,7 +288,7 @@ function loadData() {
 
         // consolidate and send the data to the client
         var shouldEmit = is_different(actual, predicted, mbg, treatment, cal);
-        patientData = [actual, predicted, mbg, treatment, cal];
+        patientData = [actual, predicted, mbg, treatment, profile, cal];
         console.log('patientData', patientData.length);
         if (shouldEmit) {
           emitData( );
diff --git a/package.json b/package.json
index af40c524b..ec203d385 100644
--- a/package.json
+++ b/package.json
@@ -34,16 +34,17 @@
   "dependencies": {
     "body-parser": "^1.4.3",
     "bower": "^1.3.8",
+    "browserify-express": "^0.1.4",
     "errorhandler": "^1.1.1",
     "event-stream": "~3.1.5",
     "express": "^4.6.1",
     "express-extension-to-accept": "0.0.2",
+    "git-rev": "git://github.com/bewest/git-rev.git",
     "mongodb": "^1.4.7",
     "moment": "2.8.1",
     "pushover-notifications": "0.2.0",
     "sgvdata": "0.0.2",
-    "socket.io": "^0.9.17",
-    "git-rev": "git://github.com/bewest/git-rev.git"
+    "socket.io": "^0.9.17"
   },
   "devDependencies": {
     "istanbul": "~0.3.5",
diff --git a/server.js b/server.js
index b1a5dd8b2..2f56c7597 100644
--- a/server.js
+++ b/server.js
@@ -50,8 +50,9 @@ var express = require('express');
 var entriesStorage = entries.storage(env.mongo_collection, store, pushover);
 var settings = require('./lib/settings')(env.settings_collection, store);
 var treatmentsStorage = treatments.storage(env.treatments_collection, store, pushover);
+var profile = require('./lib/profile')(env.profile_collection, store);
 var devicestatusStorage = devicestatus.storage(env.devicestatus_collection, store);
-var api = require('./lib/api/')(env, entriesStorage, settings, treatmentsStorage, devicestatusStorage);
+var api = require('./lib/api/')(env, entriesStorage, settings, treatmentsStorage, profile, devicestatusStorage);
 var pebble = require('./lib/pebble');
 ///////////////////////////////////////////////////
 
@@ -71,7 +72,7 @@ app.enable('trust proxy'); // Allows req.secure test on heroku https connections
 app.use('/api/v1', api);
 
 // pebble data
-app.get('/pebble', pebble(entriesStorage, devicestatusStorage, env));
+app.get('/pebble', pebble(entriesStorage, treatmentsStorage, profile, devicestatusStorage, env));
 
 //app.get('/package.json', software);
 
@@ -82,6 +83,9 @@ var staticFiles = express.static(env.static_files, {maxAge: 60 * 60 * 1000});
 // serve the static content
 app.use(staticFiles);
 
+var bundle = require('./bundle')();
+app.use(bundle);
+
 // Handle errors with express's errorhandler, to display more readable error messages.
 var errorhandler = require('errorhandler');
 //if (process.env.NODE_ENV === 'development') {
@@ -105,7 +109,7 @@ store(function ready ( ) {
   // setup socket io for data and message transmission
   ///////////////////////////////////////////////////
   var websocket = require('./lib/websocket');
-  var io = websocket(env, server, entriesStorage, treatmentsStorage);
+  var io = websocket(env, server, entriesStorage, treatmentsStorage, profile);
 });
 
 ///////////////////////////////////////////////////
diff --git a/static/css/main.css b/static/css/main.css
index ed5ef975b..020fbd4a7 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -68,25 +68,55 @@ body {
 
 .bgStatus .currentDetails {
     font-size: 25%;
-    text-decoration: line-through;
-    display: block;
-    position: relative;    
-    top: -20px;
+    position: relative;
+    top: -10px;
 }
-.bgStatus.current .currentBG {
-    text-decoration: none;
+
+.currentDetails > span {
+    border-radius: 5px;
+    border: 2px solid #bdbdbd;
+    font-size: 80%;
 }
-.bgStatus.current .currentDetails {
-    font-size: 25%;
+
+#bgButton .currentDetails > span {
+    border-color: #000;
+}
+
+.currentDetails > span:not(:first-child) {
+    margin-left: 5px;
+}
+
+.currentDetails > span * {
+    padding-left: 2px;
+    padding-right: 2px;
+    padding-bottom: 1px;
+}
+
+.currentDetails > span em {
+    color: #bdbdbd;
+    font-style: normal;
+    font-weight: bold;
+}
+
+.currentDetails > span label {
+    color: #000;
+    background: #bdbdbd;
+}
+
+#bgButton .currentDetails > span label {
+    color: #bdbdbd;
+    background: inherit;
+}
+
+.bgStatus.current .currentBG {
     text-decoration: none;
-    display: block;
-    position: relative;    
-    top: -10px;
 }
+
 .currentDirection {
     font-weight: normal;
     text-decoration: none;
-    font-size: 80%;
+    font-size: 90%;
+    vertical-align: top;
 }
 
 .time {
@@ -101,7 +131,7 @@ body {
     font-size: 25%;
 }
 #lastEntry {
-    background: #999;
+    background: #808080;
     border-radius: 5px;
     color: #000;
     padding: 0.25em;
@@ -261,6 +291,7 @@ div.tooltip {
   #currentTime {
     font-size: 85%;
   }
+
 }
 
 @media (max-width: 750px) {
@@ -272,6 +303,10 @@ div.tooltip {
     font-size: 70%;
   }
 
+  .bgStatus .currentDetails {
+    top: 0;
+  }
+
   #chartContainer {
     top: 165px;
     font-size: 80%;
@@ -305,6 +340,11 @@ div.tooltip {
         text-align: center;
         width: 100vw;
     }
+
+    .bgStatus .currentDetails {
+        top: -10px;
+    }
+
     #bgButton {
         font-size: 100%;
     }
diff --git a/static/index.html b/static/index.html
index d121858dc..703c87db5 100644
--- a/static/index.html
+++ b/static/index.html
@@ -30,13 +30,13 @@ <h1 class="customTitle">Nightscout</h1>
                     <div id="noButton">
                         <span class="currentBG">---</span>
                         <span class="currentDirection">-</span>
-                        <span class="currentDetails">--</span>
+                        <div class="currentDetails">--</div>
                         
                     </div>
                     <div id="bgButton" hidden="true">
                         <span class="currentBG">---</span>
                         <span class="currentDirection">-</span>
-                        <span class="currentDetails">--</span>
+                        <div class="currentDetails">--</div>
                     </div>
                     <ul class="dropdown-menu" id="silenceBtn">
                         <li><a href="#" data-snooze-time="1800000">Silence for 30 minutes</a></li>
@@ -220,6 +220,7 @@ <h1 class="customTitle">Nightscout</h1>
             <audio src="/audio/alarm2.mp3" preload="auto" loop="true" class="urgent alarm2 mp3" type="audio/mp3"></audio>
         </div>
 
+        <script src="/public/js/bundle.js"></script>
         <script src="/socket.io/socket.io.js"></script>
         <script src="/api/v1/status.js"></script>
         <script src="/bower_components/d3/d3.min.js"></script>
diff --git a/static/js/client.js b/static/js/client.js
index 3fd39c675..cddc7f913 100644
--- a/static/js/client.js
+++ b/static/js/client.js
@@ -28,6 +28,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
         , latestUpdateTime
         , prevSGV
         , treatments
+        , profile
         , cal
         , padding = { top: 20, right: 10, bottom: 30, left: 10 }
         , opacity = {current: 1, DAY: 1, NIGHT: 0.5}
@@ -105,10 +106,15 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
 
     function showRawBGs() {
         return app.enabledOptions
-            && app.enabledOptions.indexOf('rawbg' > -1)
+            && app.enabledOptions.indexOf('rawbg') > -1
             && (browserSettings.showRawbg == 'always' || browserSettings.showRawbg == 'noise');
     }
 
+    function showIOB() {
+        return app.enabledOptions
+            && app.enabledOptions.indexOf('iob') > -1;
+    }
+
     function rawIsigToRawBg(entry, cal) {
 
       var unfiltered = parseInt(entry.unfiltered) || 0
@@ -124,7 +130,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
         } else if (noise < 2 && browserSettings.showRawbg != 'always') {
           return 0;
         } else if (filtered == 0 || sgv < 40) {
-            console.info("Skipping ratio adjustment for SGV " + sgv);
+            console.info('Skipping ratio adjustment for SGV ' + sgv);
             return scale * (unfiltered - intercept) / slope;
         } else {
             var ratio = scale * (filtered - intercept) / slope / sgv;
@@ -329,21 +335,29 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
                     bgDeltaString = '+' + bgDelta;
                 }
 
+                bgDeltaString = '<span><em>' + bgDeltaString + '</em><label>';
+
                 if (browserSettings.units == 'mmol') {
-                    bgDeltaString = bgDeltaString + ' mmol/L'
+                    bgDeltaString = bgDeltaString + ' mmol/L';
                 } else {
-                    bgDeltaString = bgDeltaString + ' mg/dL'
+                    bgDeltaString = bgDeltaString + ' mg/dL';
                 }
             }
 
+            bgDeltaString += '</label></span>';
+
             return bgDeltaString;
         }
 
+        function buildIOBIndicator(time) {
+            var iob = Nightscout.iob.calcTotal(treatments, profile, time);
+            return '<span><label>IOB</label><em>' + iob.display + 'U</em></span>';
+        }
+
         var color = inRetroMode() ? 'grey' : sgvToColor(latestSGV.y);
 
         $('.container #noButton .currentBG').css({color: color});
         $('.container #noButton .currentDirection').css({color: color});
-        $('.container #noButton .currentDetails').css({color: color});
 
         // predict for retrospective data
         // by changing lookback from 1 to 2, we modify the AR algorithm to determine its initial slope from 10m
@@ -357,6 +371,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
         });
 
         if (inRetroMode()) {
+            var time = new Date(brushExtent[1] - THIRTY_MINS_IN_MS);
             // filter data for -12 and +5 minutes from reference time for retrospective focus data prediction
             var lookbackTime = (lookback + 2) * FIVE_MINS_IN_MS + 2 * ONE_MIN_IN_MS;
             nowData = nowData.filter(function(d) {
@@ -378,17 +393,23 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
 
                 updateCurrentSGV(focusPoint.y);
 
+                var details = calcBGDelta(prevfocusPoint.y, focusPoint.y);
+
+                if (showIOB()) {
+                    details += buildIOBIndicator(time);
+                }
+
                 currentBG.css('text-decoration','line-through');
                 currentDirection.html(focusPoint.y < 39 ? '✖' : focusPoint.direction);
-                currentDetails.text(calcBGDelta(prevfocusPoint.y, focusPoint.y)).css('text-decoration','line-through');
+                currentDetails.html(details);
             } else {
-                currentBG.text('---').css('text-decoration','');
+                currentBG.text('---');
                 currentDirection.text('-');
                 currentDetails.text('');
             }
 
             $('#currentTime')
-                .text(formatTime(new Date(brushExtent[1] - THIRTY_MINS_IN_MS)))
+                .text(formatTime(time))
                 .css('text-decoration','line-through');
 
             $('#lastEntry').text('RETRO').removeClass('current');
@@ -401,9 +422,15 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
             updateClockDisplay();
             updateTimeAgo();
 
+            var details = calcBGDelta(prevSGV.y, latestSGV.y);
+
+            if (showIOB()) {
+                details += buildIOBIndicator(nowDate);
+            }
+
             currentBG.css('text-decoration', '');
             currentDirection.html(latestSGV.y < 39 ? '✖' : latestSGV.direction);
-            currentDetails.text(calcBGDelta(prevSGV.y, latestSGV.y)).css('text-decoration','');
+            currentDetails.html(details);
         }
 
         xScale.domain(brush.extent());
@@ -1335,8 +1362,8 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
                     d.created_at = new Date(d.created_at);
                 });
 
-                cal = d[4][d[4].length-1];
-
+                profile = d[4][0];
+                cal = d[5][d[5].length-1];
 
                 var temp1 = [ ];
                 if (cal && showRawBGs()) {
diff --git a/tests/iob.test.js b/tests/iob.test.js
new file mode 100644
index 000000000..dff3bc4e5
--- /dev/null
+++ b/tests/iob.test.js
@@ -0,0 +1,80 @@
+var should = require('should');
+
+describe('IOB', function ( ) {
+  var iob = require('../lib/iob')();
+
+  it('should calculate IOB', function() {
+
+    var time = new Date()
+      , treatments = [ {
+          created_at: time - 1,
+          insulin: "1.00"
+        }
+      ]
+      , profile = {
+        dia: 3,
+        sens: 0
+      };
+
+    var rightAfterBolus = iob.calcTotal(treatments, profile, time);
+
+    rightAfterBolus.display.should.equal('1.00');
+
+    var afterSomeTime = iob.calcTotal(treatments, profile, new Date(time.getTime() + (60 * 60 * 1000)));
+
+    afterSomeTime.iob.should.be.lessThan(1);
+    afterSomeTime.iob.should.be.greaterThan(0);
+
+    var afterDIA = iob.calcTotal(treatments, profile, new Date(time.getTime() + (3 * 60 * 60 * 1000)));
+
+    afterDIA.iob.should.equal(0);
+
+  });
+
+  it('should calculate IOB using defaults', function() {
+
+    var treatments = [{
+        created_at: (new Date()) - 1,
+        insulin: "1.00"
+      }];
+
+    var rightAfterBolus = iob.calcTotal(treatments);
+
+    rightAfterBolus.display.should.equal('1.00');
+
+  });
+
+  it('should calculate IOB using a 4 hour duration', function() {
+
+    var time = new Date()
+      , treatments = [ {
+        created_at: time - 1,
+        insulin: "1.00"
+      }
+      ]
+      , profile = {
+        dia: 4,
+        sens: 0
+      };
+
+    var rightAfterBolus = iob.calcTotal(treatments, profile, time);
+
+    rightAfterBolus.display.should.equal('1.00');
+
+    var afterSomeTime = iob.calcTotal(treatments, profile, new Date(time.getTime() + (60 * 60 * 1000)));
+
+    afterSomeTime.iob.should.be.lessThan(1);
+    afterSomeTime.iob.should.be.greaterThan(0);
+
+    var after3hDIA = iob.calcTotal(treatments, profile, new Date(time.getTime() + (3 * 60 * 60 * 1000)));
+
+    after3hDIA.iob.should.greaterThan(0);
+
+    var after4hDIA = iob.calcTotal(treatments, profile, new Date(time.getTime() + (3 * 60 * 60 * 1000)));
+
+    after4hDIA.iob.should.greaterThan(0);
+
+  });
+
+
+});
\ No newline at end of file
diff --git a/tests/pebble.test.js b/tests/pebble.test.js
index 6b3b07430..d6704ed79 100644
--- a/tests/pebble.test.js
+++ b/tests/pebble.test.js
@@ -75,6 +75,18 @@ var entries = {
 };
 
 //Mock devicestatus
+var treatments = {
+  list: function(callback) {
+    callback(null, []);
+  }
+};
+
+var profile = {
+  list: function(callback) {
+    callback(null, []);
+  }
+};
+
 var devicestatus = {
   last: function(callback) {
     callback(null, {uploaderBattery: 100});
@@ -87,7 +99,7 @@ describe('Pebble Endpoint without Raw', function ( ) {
     var env = require('../env')( );
     this.app = require('express')( );
     this.app.enable('api');
-    this.app.use('/pebble', pebble(entries, devicestatus, env));
+    this.app.use('/pebble', pebble(entries, treatments, profile, devicestatus, env));
     done();
   });
 
@@ -128,7 +140,7 @@ describe('Pebble Endpoint with Raw', function ( ) {
     envRaw.enable = "rawbg";
     this.appRaw = require('express')( );
     this.appRaw.enable('api');
-    this.appRaw.use('/pebble', pebbleRaw(entries, devicestatus, envRaw));
+    this.appRaw.use('/pebble', pebbleRaw(entries, treatments, profile, devicestatus, envRaw));
     done();
   });