flashgrid-ext 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba86b31925db6edb41610e3f27f506e99454156
-  data.tar.gz: 50a15fe0aa47efa631a6383431a596c48a04f9ff
+  metadata.gz: 498b94d1dd886a00fc90c94ddcd565049ddcff67
+  data.tar.gz: 636e5899ea50dcd923dce8e09e2f8bfdacc1d1d5
 SHA512:
-  metadata.gz: 0eb93ccd40c9c78396cdc47f675504822cba46e944e252c36a142624537bf9962b88e57b4cf23d757dfe44c31c9d77a9bd74b8904f7aba04855406ec79a619bf
-  data.tar.gz: d3c39234c68a7b0322baaf3eb888b06b8aebd971ca2fb75db3dd709e8746447d8fb9873221589040e8b7096d38b999e92dcf3c886adc2e703e6debd6e27d8f63
+  metadata.gz: bc8415e599bdbff5d6c070eaf2aa82e9838e995f3d40bee6036bcc37fc34c3b9a533c3e98bc38042361dba6dfc2d26b1c3ed901f4916288c084dbedb54088856
+  data.tar.gz: 3131953fc868b849d0e7feb16c581ccda3cf8b0f655e4ef1ab0799468cffbff6cc264ec075bee8cf2b395053a1f057f05d588676dc2875e64e4abdf7372be7f7

data/lib/flashgrid/ext/version.rb

@@ -1,5 +1,5 @@
 module Flashgrid
   module Ext
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/vendor/assets/javascripts/chart.js

@@ -1,1751 +1,3280 @@
-window.Chart = function(context, options){
-  var chart = this;
+(function(){
 
-  var animationOptions = {
-    linear : function (t){
-      return t;
+  "use strict";
+
+  //Declare root variable - window in the browser, global on the server
+  var root = this,
+    previous = root.Chart;
+
+  //Occupy the global variable of Chart, and create a simple base class
+  var Chart = function(context){
+    var chart = this;
+    this.canvas = context.canvas;
+
+    this.ctx = context;
+
+    //Variables global to the chart
+    var width = this.width = context.canvas.width;
+    var height = this.height = context.canvas.height;
+    this.aspectRatio = this.width / this.height;
+    //High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
+    helpers.retinaScale(this);
+
+    return this;
+  };
+  //Globally expose the defaults to allow for user updating/changing
+  Chart.defaults = {
+    global: {
+      // Boolean - Whether to animate the chart
+      animation: true,
+
+      // Number - Number of animation steps
+      animationSteps: 60,
+
+      // String - Animation easing effect
+      animationEasing: "easeOutQuart",
+
+      // Boolean - If we should show the scale at all
+      showScale: true,
+
+      // Boolean - If we want to override with a hard coded scale
+      scaleOverride: false,
+
+      // ** Required if scaleOverride is true **
+      // Number - The number of steps in a hard coded scale
+      scaleSteps: null,
+      // Number - The value jump in the hard coded scale
+      scaleStepWidth: null,
+      // Number - The scale starting value
+      scaleStartValue: null,
+
+      // String - Colour of the scale line
+      scaleLineColor: "rgba(0,0,0,.1)",
+
+      // Number - Pixel width of the scale line
+      scaleLineWidth: 1,
+
+      // Boolean - Whether to show labels on the scale
+      scaleShowLabels: true,
+
+      // Interpolated JS string - can access value
+      scaleLabel: "<%=value%>",
+
+      // Boolean - Whether the scale should stick to integers, and not show any floats even if drawing space is there
+      scaleIntegersOnly: true,
+
+      // Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
+      scaleBeginAtZero: false,
+
+      // String - Scale label font declaration for the scale label
+      scaleFontFamily: "'Gotham', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+      // Number - Scale label font size in pixels
+      scaleFontSize: 13,
+
+      // String - Scale label font weight style
+      scaleFontStyle: "normal",
+
+      // String - Scale label font colour
+      scaleFontColor: "rgba(158,171,179,1)",
+
+      // Boolean - whether or not the chart should be responsive and resize when the browser does.
+      responsive: true,
+
+      // Boolean - Determines whether to draw tooltips on the canvas or not - attaches events to touchmove & mousemove
+      showTooltips: true,
+
+      // Array - Array of string names to attach tooltip events
+      tooltipEvents: ["mousemove", "touchstart", "touchmove", "mouseout"],
+
+      // String - Tooltip background colour
+      tooltipFillColor: "rgba(71,74,84,1)",
+
+      // String - Tooltip label font declaration for the scale label
+      tooltipFontFamily: "'Gotham', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+      // Number - Tooltip label font size in pixels
+      tooltipFontSize: 11,
+
+      // String - Tooltip font weight style
+      tooltipFontStyle: "bold",
+
+      // String - Tooltip label font colour
+      tooltipFontColor: "rgba(255,255,255,1)",
+
+      // String - Tooltip title font declaration for the scale label
+      tooltipTitleFontFamily: "'Gotham', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+      // Number - Tooltip title font size in pixels
+      tooltipTitleFontSize: 11,
+
+      // String - Tooltip title font weight style
+      tooltipTitleFontStyle: "bold",
+
+      // String - Tooltip title font colour
+      tooltipTitleFontColor: "rgba(255,255,255,1)",
+
+      // Number - pixel width of padding around tooltip text
+      tooltipYPadding: 8,
+
+      // Number - pixel width of padding around tooltip text
+      tooltipXPadding: 10,
+
+      // Number - Size of the caret on the tooltip
+      tooltipCaretSize: 5,
+
+      // Number - Pixel radius of the tooltip border
+      tooltipCornerRadius: 3,
+
+      // Number - Pixel offset from point x to tooltip edge
+      tooltipXOffset: 10,
+
+      // String - Template string for single tooltips
+      tooltipTemplate: "<%if (label){%><%=label%>: <%}%><%= value %>",
+
+      // String - Template string for single tooltips
+      multiTooltipTemplate: "<%= value %>",
+
+      // String - Colour behind the legend colour block
+      multiTooltipKeyBackground: 'rgba(255,255,255,1)',
+
+      // Function - Will fire on animation progression.
+      onAnimationProgress: function(){},
+
+      // Function - Will fire on animation completion.
+      onAnimationComplete: function(){}
+
+    }
+  };
+
+  //Create a dictionary of chart types, to allow for extension of existing types
+  Chart.types = {};
+
+  //Global Chart helpers object for utility methods and classes
+  var helpers = Chart.helpers = {};
+
+    //-- Basic js utility methods
+  var each = helpers.each = function(loopable,callback,self){
+      var additionalArgs = Array.prototype.slice.call(arguments, 3);
+      // Check to see if null or undefined firstly.
+      if (loopable){
+        if (loopable.length === +loopable.length){
+          var i;
+          for (i=0; i<loopable.length; i++){
+            callback.apply(self,[loopable[i], i].concat(additionalArgs));
+          }
+        }
+        else{
+          for (var item in loopable){
+            callback.apply(self,[loopable[item],item].concat(additionalArgs));
+          }
+        }
+      }
+    },
+    clone = helpers.clone = function(obj){
+      var objClone = {};
+      each(obj,function(value,key){
+        if (obj.hasOwnProperty(key)) objClone[key] = value;
+      });
+      return objClone;
+    },
+    extend = helpers.extend = function(base){
+      each(Array.prototype.slice.call(arguments,1), function(extensionObject) {
+        each(extensionObject,function(value,key){
+          if (extensionObject.hasOwnProperty(key)) base[key] = value;
+        });
+      });
+      return base;
+    },
+    merge = helpers.merge = function(base,master){
+      //Merge properties in left object over to a shallow clone of object right.
+      var args = Array.prototype.slice.call(arguments,0);
+      args.unshift({});
+      return extend.apply(null, args);
+    },
+    indexOf = helpers.indexOf = function(arrayToSearch, item){
+      if (Array.prototype.indexOf) {
+        return arrayToSearch.indexOf(item);
+      }
+      else{
+        for (var i = 0; i < arrayToSearch.length; i++) {
+          if (arrayToSearch[i] === item) return i;
+        }
+        return -1;
+      }
+    },
+    inherits = helpers.inherits = function(extensions){
+      //Basic javascript inheritance based on the model created in Backbone.js
+      var parent = this;
+      var ChartElement = (extensions && extensions.hasOwnProperty("constructor")) ? extensions.constructor : function(){ return parent.apply(this, arguments); };
+
+      var Surrogate = function(){ this.constructor = ChartElement;};
+      Surrogate.prototype = parent.prototype;
+      ChartElement.prototype = new Surrogate();
+
+      ChartElement.extend = inherits;
+
+      if (extensions) extend(ChartElement.prototype, extensions);
+
+      ChartElement.__super__ = parent.prototype;
+
+      return ChartElement;
+    },
+    noop = helpers.noop = function(){},
+    uid = helpers.uid = (function(){
+      var id=0;
+      return function(){
+        return "chart-" + id++;
+      };
+    })(),
+    warn = helpers.warn = function(str){
+      //Method for warning of errors
+      if (window.console && typeof window.console.warn == "function") console.warn(str);
+    },
+    amd = helpers.amd = (typeof root.define == 'function' && root.define.amd),
+    //-- Math methods
+    isNumber = helpers.isNumber = function(n){
+      return !isNaN(parseFloat(n)) && isFinite(n);
+    },
+    max = helpers.max = function(array){
+      return Math.max.apply( Math, array );
+    },
+    min = helpers.min = function(array){
+      return Math.min.apply( Math, array );
+    },
+    cap = helpers.cap = function(valueToCap,maxValue,minValue){
+      if(isNumber(maxValue)) {
+        if( valueToCap > maxValue ) {
+          return maxValue;
+        }
+      }
+      else if(isNumber(minValue)){
+        if ( valueToCap < minValue ){
+          return minValue;
+        }
+      }
+      return valueToCap;
+    },
+    getDecimalPlaces = helpers.getDecimalPlaces = function(num){
+      if (num%1!==0 && isNumber(num)){
+        return num.toString().split(".")[1].length;
+      }
+      else {
+        return 0;
+      }
+    },
+    toRadians = helpers.radians = function(degrees){
+      return degrees * (Math.PI/180);
+    },
+    // Gets the angle from vertical upright to the point about a centre.
+    getAngleFromPoint = helpers.getAngleFromPoint = function(centrePoint, anglePoint){
+      var distanceFromXCenter = anglePoint.x - centrePoint.x,
+        distanceFromYCenter = anglePoint.y - centrePoint.y,
+        radialDistanceFromCenter = Math.sqrt( distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
+
+
+      var angle = Math.PI * 2 + Math.atan2(distanceFromYCenter, distanceFromXCenter);
+
+      //If the segment is in the top left quadrant, we need to add another rotation to the angle
+      if (distanceFromXCenter < 0 && distanceFromYCenter < 0){
+        angle += Math.PI*2;
+      }
+
+      return {
+        angle: angle,
+        distance: radialDistanceFromCenter
+      };
     },
-    easeInQuad: function (t) {
-      return t*t;
+    aliasPixel = helpers.aliasPixel = function(pixelWidth){
+      return (pixelWidth % 2 === 0) ? 0 : 0.5;
     },
-    easeOutQuad: function (t) {
-      return -1 *t*(t-2);
+    splineCurve = helpers.splineCurve = function(FirstPoint,MiddlePoint,AfterPoint,t){
+      //Props to Rob Spencer at scaled innovation for his post on splining between points
+      //http://scaledinnovation.com/analytics/splines/aboutSplines.html
+      var d01=Math.sqrt(Math.pow(MiddlePoint.x-FirstPoint.x,2)+Math.pow(MiddlePoint.y-FirstPoint.y,2)),
+        d12=Math.sqrt(Math.pow(AfterPoint.x-MiddlePoint.x,2)+Math.pow(AfterPoint.y-MiddlePoint.y,2)),
+        fa=t*d01/(d01+d12),// scaling factor for triangle Ta
+        fb=t*d12/(d01+d12);
+      return {
+        inner : {
+          x : MiddlePoint.x-fa*(AfterPoint.x-FirstPoint.x),
+          y : MiddlePoint.y-fa*(AfterPoint.y-FirstPoint.y)
+        },
+        outer : {
+          x: MiddlePoint.x+fb*(AfterPoint.x-FirstPoint.x),
+          y : MiddlePoint.y+fb*(AfterPoint.y-FirstPoint.y)
+        }
+      };
+    },
+    calculateOrderOfMagnitude = helpers.calculateOrderOfMagnitude = function(val){
+      return Math.floor(Math.log(val) / Math.LN10);
     },
-    easeInOutQuad: function (t) {
-      if ((t/=1/2) < 1) return 1/2*t*t;
-      return -1/2 * ((--t)*(t-2) - 1);
+    calculateScaleRange = helpers.calculateScaleRange = function(valuesArray, drawingSize, textSize, startFromZero, integersOnly){
+
+      //Set a minimum step of two - a point at the top of the graph, and a point at the base
+      var minSteps = 2,
+        maxSteps = Math.floor(drawingSize/(textSize * 1.5)),
+        skipFitting = (minSteps >= maxSteps);
+
+      var maxValue = max(valuesArray),
+        minValue = min(valuesArray);
+
+      // We need some degree of seperation here to calculate the scales if all the values are the same
+      // Adding/minusing 0.5 will give us a range of 1.
+      if (maxValue === minValue){
+        maxValue += 0.5;
+        // So we don't end up with a graph with a negative start value if we've said always start from zero
+        if (minValue >= 0.5 && !startFromZero){
+          minValue -= 0.5;
+        }
+        else{
+          // Make up a whole number above the values
+          maxValue += 0.5;
+        }
+      }
+
+      var valueRange = Math.abs(maxValue - minValue),
+        rangeOrderOfMagnitude = calculateOrderOfMagnitude(valueRange),
+        graphMax = Math.ceil(maxValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude),
+        graphMin = (startFromZero) ? 0 : Math.floor(minValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude),
+        graphRange = graphMax - graphMin,
+        stepValue = Math.pow(10, rangeOrderOfMagnitude),
+        numberOfSteps = Math.round(graphRange / stepValue);
+
+      //If we have more space on the graph we'll use it to give more definition to the data
+      while((numberOfSteps > maxSteps || (numberOfSteps * 2) < maxSteps) && !skipFitting) {
+        if(numberOfSteps > maxSteps){
+          stepValue *=2;
+          numberOfSteps = Math.round(graphRange/stepValue);
+          // Don't ever deal with a decimal number of steps - cancel fitting and just use the minimum number of steps.
+          if (numberOfSteps % 1 !== 0){
+            skipFitting = true;
+          }
+        }
+        //We can fit in double the amount of scale points on the scale
+        else{
+          //If user has declared ints only, and the step value isn't a decimal
+          if (integersOnly && rangeOrderOfMagnitude >= 0){
+            //If the user has said integers only, we need to check that making the scale more granular wouldn't make it a float
+            if(stepValue/2 % 1 === 0){
+              stepValue /=2;
+              numberOfSteps = Math.round(graphRange/stepValue);
+            }
+            //If it would make it a float break out of the loop
+            else{
+              break;
+            }
+          }
+          //If the scale doesn't have to be an int, make the scale more granular anyway.
+          else{
+            stepValue /=2;
+            numberOfSteps = Math.round(graphRange/stepValue);
+          }
+
+        }
+      }
+
+      if (skipFitting){
+        numberOfSteps = minSteps;
+        stepValue = graphRange / numberOfSteps;
+      }
+
+      return {
+        steps : numberOfSteps,
+        stepValue : stepValue,
+        min : graphMin,
+        max : graphMin + (numberOfSteps * stepValue)
+      };
+
+    },
+    /* jshint ignore:start */
+    // Blows up jshint errors based on the new Function constructor
+    //Templating methods
+    //Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
+    template = helpers.template = function(templateString, valuesObject){
+      var cache = {};
+      function tmpl(str, data){
+        // Figure out if we're getting a template, or if we need to
+        // load the template - and be sure to cache the result.
+        var fn = !/\W/.test(str) ?
+        cache[str] = cache[str] :
+
+        // Generate a reusable function that will serve as a template
+        // generator (and which will be cached).
+        new Function("obj",
+          "var p=[],print=function(){p.push.apply(p,arguments);};" +
+
+          // Introduce the data as local variables using with(){}
+          "with(obj){p.push('" +
+
+          // Convert the template into pure JavaScript
+          str
+            .replace(/[\r\t\n]/g, " ")
+            .split("<%").join("\t")
+            .replace(/((^|%>)[^\t]*)'/g, "$1\r")
+            .replace(/\t=(.*?)%>/g, "',$1,'")
+            .split("\t").join("');")
+            .split("%>").join("p.push('")
+            .split("\r").join("\\'") +
+          "');}return p.join('');"
+        );
+
+        // Provide some basic currying to the user
+        return data ? fn( data ) : fn;
+      }
+      return tmpl(templateString,valuesObject);
+    },
+    /* jshint ignore:end */
+    generateLabels = helpers.generateLabels = function(templateString,numberOfSteps,graphMin,stepValue){
+      var labelsArray = new Array(numberOfSteps);
+      if (labelTemplateString){
+        each(labelsArray,function(val,index){
+          labelsArray[index] = template(templateString,{value: (graphMin + (stepValue*(index+1)))});
+        });
+      }
+      return labelsArray;
+    },
+    //--Animation methods
+    //Easing functions adapted from Robert Penner's easing equations
+    //http://www.robertpenner.com/easing/
+    easingEffects = helpers.easingEffects = {
+      linear: function (t) {
+        return t;
+      },
+      easeInQuad: function (t) {
+        return t * t;
+      },
+      easeOutQuad: function (t) {
+        return -1 * t * (t - 2);
+      },
+      easeInOutQuad: function (t) {
+        if ((t /= 1 / 2) < 1) return 1 / 2 * t * t;
+        return -1 / 2 * ((--t) * (t - 2) - 1);
+      },
+      easeInCubic: function (t) {
+        return t * t * t;
+      },
+      easeOutCubic: function (t) {
+        return 1 * ((t = t / 1 - 1) * t * t + 1);
+      },
+      easeInOutCubic: function (t) {
+        if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t;
+        return 1 / 2 * ((t -= 2) * t * t + 2);
+      },
+      easeInQuart: function (t) {
+        return t * t * t * t;
+      },
+      easeOutQuart: function (t) {
+        return -1 * ((t = t / 1 - 1) * t * t * t - 1);
+      },
+      easeInOutQuart: function (t) {
+        if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t * t;
+        return -1 / 2 * ((t -= 2) * t * t * t - 2);
+      },
+      easeInQuint: function (t) {
+        return 1 * (t /= 1) * t * t * t * t;
+      },
+      easeOutQuint: function (t) {
+        return 1 * ((t = t / 1 - 1) * t * t * t * t + 1);
+      },
+      easeInOutQuint: function (t) {
+        if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t * t * t;
+        return 1 / 2 * ((t -= 2) * t * t * t * t + 2);
+      },
+      easeInSine: function (t) {
+        return -1 * Math.cos(t / 1 * (Math.PI / 2)) + 1;
+      },
+      easeOutSine: function (t) {
+        return 1 * Math.sin(t / 1 * (Math.PI / 2));
+      },
+      easeInOutSine: function (t) {
+        return -1 / 2 * (Math.cos(Math.PI * t / 1) - 1);
+      },
+      easeInExpo: function (t) {
+        return (t === 0) ? 1 : 1 * Math.pow(2, 10 * (t / 1 - 1));
+      },
+      easeOutExpo: function (t) {
+        return (t === 1) ? 1 : 1 * (-Math.pow(2, -10 * t / 1) + 1);
+      },
+      easeInOutExpo: function (t) {
+        if (t === 0) return 0;
+        if (t === 1) return 1;
+        if ((t /= 1 / 2) < 1) return 1 / 2 * Math.pow(2, 10 * (t - 1));
+        return 1 / 2 * (-Math.pow(2, -10 * --t) + 2);
+      },
+      easeInCirc: function (t) {
+        if (t >= 1) return t;
+        return -1 * (Math.sqrt(1 - (t /= 1) * t) - 1);
+      },
+      easeOutCirc: function (t) {
+        return 1 * Math.sqrt(1 - (t = t / 1 - 1) * t);
+      },
+      easeInOutCirc: function (t) {
+        if ((t /= 1 / 2) < 1) return -1 / 2 * (Math.sqrt(1 - t * t) - 1);
+        return 1 / 2 * (Math.sqrt(1 - (t -= 2) * t) + 1);
+      },
+      easeInElastic: function (t) {
+        var s = 1.70158;
+        var p = 0;
+        var a = 1;
+        if (t === 0) return 0;
+        if ((t /= 1) == 1) return 1;
+        if (!p) p = 1 * 0.3;
+        if (a < Math.abs(1)) {
+          a = 1;
+          s = p / 4;
+        } else s = p / (2 * Math.PI) * Math.asin(1 / a);
+        return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p));
+      },
+      easeOutElastic: function (t) {
+        var s = 1.70158;
+        var p = 0;
+        var a = 1;
+        if (t === 0) return 0;
+        if ((t /= 1) == 1) return 1;
+        if (!p) p = 1 * 0.3;
+        if (a < Math.abs(1)) {
+          a = 1;
+          s = p / 4;
+        } else s = p / (2 * Math.PI) * Math.asin(1 / a);
+        return a * Math.pow(2, -10 * t) * Math.sin((t * 1 - s) * (2 * Math.PI) / p) + 1;
+      },
+      easeInOutElastic: function (t) {
+        var s = 1.70158;
+        var p = 0;
+        var a = 1;
+        if (t === 0) return 0;
+        if ((t /= 1 / 2) == 2) return 1;
+        if (!p) p = 1 * (0.3 * 1.5);
+        if (a < Math.abs(1)) {
+          a = 1;
+          s = p / 4;
+        } else s = p / (2 * Math.PI) * Math.asin(1 / a);
+        if (t < 1) return -0.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p));
+        return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p) * 0.5 + 1;
+      },
+      easeInBack: function (t) {
+        var s = 1.70158;
+        return 1 * (t /= 1) * t * ((s + 1) * t - s);
+      },
+      easeOutBack: function (t) {
+        var s = 1.70158;
+        return 1 * ((t = t / 1 - 1) * t * ((s + 1) * t + s) + 1);
+      },
+      easeInOutBack: function (t) {
+        var s = 1.70158;
+        if ((t /= 1 / 2) < 1) return 1 / 2 * (t * t * (((s *= (1.525)) + 1) * t - s));
+        return 1 / 2 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
+      },
+      easeInBounce: function (t) {
+        return 1 - easingEffects.easeOutBounce(1 - t);
+      },
+      easeOutBounce: function (t) {
+        if ((t /= 1) < (1 / 2.75)) {
+          return 1 * (7.5625 * t * t);
+        } else if (t < (2 / 2.75)) {
+          return 1 * (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75);
+        } else if (t < (2.5 / 2.75)) {
+          return 1 * (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375);
+        } else {
+          return 1 * (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375);
+        }
+      },
+      easeInOutBounce: function (t) {
+        if (t < 1 / 2) return easingEffects.easeInBounce(t * 2) * 0.5;
+        return easingEffects.easeOutBounce(t * 2 - 1) * 0.5 + 1 * 0.5;
+      }
     },
-    easeInCubic: function (t) {
-      return t*t*t;
+    //Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
+    requestAnimFrame = helpers.requestAnimFrame = (function(){
+      return window.requestAnimationFrame ||
+        window.webkitRequestAnimationFrame ||
+        window.mozRequestAnimationFrame ||
+        window.oRequestAnimationFrame ||
+        window.msRequestAnimationFrame ||
+        function(callback) {
+          return window.setTimeout(callback, 1000 / 60);
+        };
+    })(),
+    cancelAnimFrame = helpers.cancelAnimFrame = (function(){
+      return window.cancelAnimationFrame ||
+        window.webkitCancelAnimationFrame ||
+        window.mozCancelAnimationFrame ||
+        window.oCancelAnimationFrame ||
+        window.msCancelAnimationFrame ||
+        function(callback) {
+          return window.clearTimeout(callback, 1000 / 60);
+        };
+    })(),
+    animationLoop = helpers.animationLoop = function(callback,totalSteps,easingString,onProgress,onComplete,chartInstance){
+
+      var currentStep = 0,
+        easingFunction = easingEffects[easingString] || easingEffects.linear;
+
+      var animationFrame = function(){
+        currentStep++;
+        var stepDecimal = currentStep/totalSteps;
+        var easeDecimal = easingFunction(stepDecimal);
+
+        callback.call(chartInstance,easeDecimal,stepDecimal, currentStep);
+        onProgress.call(chartInstance,easeDecimal,stepDecimal);
+        if (currentStep < totalSteps){
+          chartInstance.animationFrame = requestAnimFrame(animationFrame);
+        } else{
+          onComplete.apply(chartInstance);
+        }
+      };
+      requestAnimFrame(animationFrame);
     },
-    easeOutCubic: function (t) {
-      return 1*((t=t/1-1)*t*t + 1);
+    //-- DOM methods
+    getRelativePosition = helpers.getRelativePosition = function(evt){
+      var mouseX, mouseY;
+      var e = evt.originalEvent || evt,
+        canvas = evt.currentTarget || evt.srcElement,
+        boundingRect = canvas.getBoundingClientRect();
+
+      if (e.touches){
+        mouseX = e.touches[0].clientX - boundingRect.left;
+        mouseY = e.touches[0].clientY - boundingRect.top;
+
+      }
+      else{
+        mouseX = e.clientX - boundingRect.left;
+        mouseY = e.clientY - boundingRect.top;
+      }
+
+      return {
+        x : mouseX,
+        y : mouseY
+      };
+
     },
-    easeInOutCubic: function (t) {
-      if ((t/=1/2) < 1) return 1/2*t*t*t;
-      return 1/2*((t-=2)*t*t + 2);
+    addEvent = helpers.addEvent = function(node,eventType,method){
+      if (node.addEventListener){
+        node.addEventListener(eventType,method);
+      } else if (node.attachEvent){
+        node.attachEvent("on"+eventType, method);
+      } else {
+        node["on"+eventType] = method;
+      }
     },
-    easeInQuart: function (t) {
-      return t*t*t*t;
+    removeEvent = helpers.removeEvent = function(node, eventType, handler){
+      if (node.removeEventListener){
+        node.removeEventListener(eventType, handler, false);
+      } else if (node.detachEvent){
+        node.detachEvent("on"+eventType,handler);
+      } else{
+        node["on" + eventType] = noop;
+      }
     },
-    easeOutQuart: function (t) {
-      return -1 * ((t=t/1-1)*t*t*t - 1);
+    bindEvents = helpers.bindEvents = function(chartInstance, arrayOfEvents, handler){
+      // Create the events object if it's not already present
+      if (!chartInstance.events) chartInstance.events = {};
+
+      each(arrayOfEvents,function(eventName){
+        chartInstance.events[eventName] = function(){
+          handler.apply(chartInstance, arguments);
+        };
+        addEvent(chartInstance.chart.canvas,eventName,chartInstance.events[eventName]);
+      });
     },
-    easeInOutQuart: function (t) {
-      if ((t/=1/2) < 1) return 1/2*t*t*t*t;
-      return -1/2 * ((t-=2)*t*t*t - 2);
+    unbindEvents = helpers.unbindEvents = function (chartInstance, arrayOfEvents) {
+      each(arrayOfEvents, function(handler,eventName){
+        removeEvent(chartInstance.chart.canvas, eventName, handler);
+      });
     },
-    easeInQuint: function (t) {
-      return 1*(t/=1)*t*t*t*t;
+    getMaximumSize = helpers.getMaximumSize = function(domNode){
+      var container = domNode.parentNode;
+      // TODO = check cross browser stuff with this.
+      return container.clientWidth;
     },
-    easeOutQuint: function (t) {
-      return 1*((t=t/1-1)*t*t*t*t + 1);
+    retinaScale = helpers.retinaScale = function(chart){
+      var ctx = chart.ctx,
+        width = chart.canvas.width,
+        height = chart.canvas.height;
+      //console.log(width + " x " + height);
+      if (window.devicePixelRatio) {
+        ctx.canvas.style.width = width + "px";
+        ctx.canvas.style.height = height + "px";
+        ctx.canvas.height = height * window.devicePixelRatio;
+        ctx.canvas.width = width * window.devicePixelRatio;
+        ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+      }
     },
-    easeInOutQuint: function (t) {
-      if ((t/=1/2) < 1) return 1/2*t*t*t*t*t;
-      return 1/2*((t-=2)*t*t*t*t + 2);
+    //-- Canvas methods
+    clear = helpers.clear = function(chart){
+      chart.ctx.clearRect(0,0,chart.width,chart.height);
     },
-    easeInSine: function (t) {
-      return -1 * Math.cos(t/1 * (Math.PI/2)) + 1;
+    fontString = helpers.fontString = function(pixelSize,fontStyle,fontFamily){
+      return fontStyle + " " + pixelSize+"px " + fontFamily;
     },
-    easeOutSine: function (t) {
-      return 1 * Math.sin(t/1 * (Math.PI/2));
+    longestText = helpers.longestText = function(ctx,font,arrayOfStrings){
+      ctx.font = font;
+      var longest = 0;
+      each(arrayOfStrings,function(string){
+        var textWidth = ctx.measureText(string).width;
+        longest = (textWidth > longest) ? textWidth : longest;
+      });
+      return longest;
     },
-    easeInOutSine: function (t) {
-      return -1/2 * (Math.cos(Math.PI*t/1) - 1);
+    drawRoundedRectangle = helpers.drawRoundedRectangle = function(ctx,x,y,width,height,radius){
+      ctx.beginPath();
+      ctx.moveTo(x + radius, y);
+      ctx.lineTo(x + width - radius, y);
+      ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
+      ctx.lineTo(x + width, y + height - radius);
+      ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+      ctx.lineTo(x + radius, y + height);
+      ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
+      ctx.lineTo(x, y + radius);
+      ctx.quadraticCurveTo(x, y, x + radius, y);
+      ctx.closePath();
+    };
+
+
+  //Store a reference to each instance - allowing us to globally resize chart instances on window resize.
+  //Destroy method on the chart will remove the instance of the chart from this reference.
+  Chart.instances = {};
+
+  Chart.Type = function(data,options,chart){
+    this.options = options;
+    this.chart = chart;
+    this.id = uid();
+    //Add the chart instance to the global namespace
+    Chart.instances[this.id] = this;
+
+    // Initialize is always called when a chart type is created
+    // By default it is a no op, but it should be extended
+    if (options.responsive){
+      this.resize();
+    }
+    this.initialize.call(this,data);
+  };
+
+  //Core methods that'll be a part of every chart type
+  extend(Chart.Type.prototype,{
+    initialize : function(){return this;},
+    clear : function(){
+      clear(this.chart);
+      return this;
+    },
+    stop : function(){
+      // Stops any current animation loop occuring
+      helpers.cancelAnimFrame.call(root, this.animationFrame);
+      return this;
+    },
+    resize : function(callback){
+      this.stop();
+      var canvas = this.chart.canvas,
+        newWidth = getMaximumSize(this.chart.canvas),
+        newHeight = newWidth / this.chart.aspectRatio;
+
+      canvas.width = this.chart.width = newWidth;
+      canvas.height =  this.chart.height = newHeight;
+
+      retinaScale(this.chart);
+
+      if (typeof callback === "function"){
+        callback.apply(this, Array.prototype.slice.call(arguments, 1));
+      }
+      return this;
+    },
+    reflow : noop,
+    render : function(reflow){
+      if (reflow){
+        this.reflow();
+      }
+      if (this.options.animation && !reflow){
+        helpers.animationLoop(
+          this.draw,
+          this.options.animationSteps,
+          this.options.animationEasing,
+          this.options.onAnimationProgress,
+          this.options.onAnimationComplete,
+          this
+        );
+      }
+      else{
+        this.draw();
+        this.options.onAnimationComplete.call(this);
+      }
+      return this;
+    },
+    generateLegend : function(){
+      return template(this.options.legendTemplate,this);
+    },
+    destroy : function(){
+      this.clear();
+      unbindEvents(this, this.events);
+      delete Chart.instances[this.id];
+    },
+    showTooltip : function(ChartElements, forceRedraw){
+      // Only redraw the chart if we've actually changed what we're hovering on.
+      if (typeof this.activeElements === 'undefined') this.activeElements = [];
+
+      var isChanged = (function(Elements){
+        var changed = false;
+
+        if (Elements.length !== this.activeElements.length){
+          changed = true;
+          return changed;
+        }
+
+        each(Elements, function(element, index){
+          if (element !== this.activeElements[index]){
+            changed = true;
+          }
+        }, this);
+        return changed;
+      }).call(this, ChartElements);
+
+      if (!isChanged && !forceRedraw){
+        return;
+      }
+      else{
+        this.activeElements = ChartElements;
+      }
+      this.draw();
+      if (ChartElements.length > 0){
+        // If we have multiple datasets, show a MultiTooltip for all of the data points at that index
+        if (this.datasets && this.datasets.length > 1) {
+          var dataArray,
+            dataIndex;
+
+          for (var i = this.datasets.length - 1; i >= 0; i--) {
+            dataArray = this.datasets[i].points || this.datasets[i].bars || this.datasets[i].segments;
+            dataIndex = indexOf(dataArray, ChartElements[0]);
+            if (dataIndex !== -1){
+              break;
+            }
+          }
+          var tooltipLabels = [],
+            tooltipColors = [],
+            medianPosition = (function(index) {
+
+              // Get all the points at that particular index
+              var Elements = [],
+                dataCollection,
+                xPositions = [],
+                yPositions = [],
+                xMax,
+                yMax,
+                xMin,
+                yMin;
+              helpers.each(this.datasets, function(dataset){
+                dataCollection = dataset.points || dataset.bars || dataset.segments;
+                Elements.push(dataCollection[dataIndex]);
+              });
+
+              helpers.each(Elements, function(element) {
+                xPositions.push(element.x);
+                yPositions.push(element.y);
+
+
+                //Include any colour information about the element
+                tooltipLabels.push(helpers.template(this.options.multiTooltipTemplate, element));
+                tooltipColors.push({
+                  fill: element._saved.fillColor || element.fillColor,
+                  stroke: element._saved.strokeColor || element.strokeColor
+                });
+
+              }, this);
+
+              yMin = min(yPositions);
+              yMax = max(yPositions);
+
+              xMin = min(xPositions);
+              xMax = max(xPositions);
+
+              return {
+                x: (xMin > this.chart.width/2) ? xMin : xMax,
+                y: (yMin + yMax)/2
+              };
+            }).call(this, dataIndex);
+
+          new Chart.MultiTooltip({
+            x: medianPosition.x,
+            y: medianPosition.y,
+            xPadding: this.options.tooltipXPadding,
+            yPadding: this.options.tooltipYPadding,
+            xOffset: this.options.tooltipXOffset,
+            fillColor: this.options.tooltipFillColor,
+            textColor: this.options.tooltipFontColor,
+            fontFamily: this.options.tooltipFontFamily,
+            fontStyle: this.options.tooltipFontStyle,
+            fontSize: this.options.tooltipFontSize,
+            titleTextColor: this.options.tooltipTitleFontColor,
+            titleFontFamily: this.options.tooltipTitleFontFamily,
+            titleFontStyle: this.options.tooltipTitleFontStyle,
+            titleFontSize: this.options.tooltipTitleFontSize,
+            cornerRadius: this.options.tooltipCornerRadius,
+            labels: tooltipLabels,
+            legendColors: tooltipColors,
+            legendColorBackground : this.options.multiTooltipKeyBackground,
+            title: ChartElements[0].label,
+            chart: this.chart,
+            ctx: this.chart.ctx
+          }).draw();
+
+        } else {
+          each(ChartElements, function(Element) {
+            var tooltipPosition = Element.tooltipPosition();
+            new Chart.Tooltip({
+              x: Math.round(tooltipPosition.x),
+              y: Math.round(tooltipPosition.y),
+              xPadding: this.options.tooltipXPadding,
+              yPadding: this.options.tooltipYPadding,
+              fillColor: this.options.tooltipFillColor,
+              textColor: this.options.tooltipFontColor,
+              fontFamily: this.options.tooltipFontFamily,
+              fontStyle: this.options.tooltipFontStyle,
+              fontSize: this.options.tooltipFontSize,
+              caretHeight: this.options.tooltipCaretSize,
+              cornerRadius: this.options.tooltipCornerRadius,
+              text: template(this.options.tooltipTemplate, Element),
+              chart: this.chart
+            }).draw();
+          }, this);
+        }
+      }
+      return this;
+    },
+    toBase64Image : function(){
+      return this.chart.canvas.toDataURL.apply(this.chart.canvas, arguments);
+    }
+  });
+
+  Chart.Type.extend = function(extensions){
+
+    var parent = this;
+
+    var ChartType = function(){
+      return parent.apply(this,arguments);
+    };
+
+    //Copy the prototype object of the this class
+    ChartType.prototype = clone(parent.prototype);
+    //Now overwrite some of the properties in the base class with the new extensions
+    extend(ChartType.prototype, extensions);
+
+    ChartType.extend = Chart.Type.extend;
+
+    if (extensions.name || parent.prototype.name){
+
+      var chartName = extensions.name || parent.prototype.name;
+      //Assign any potential default values of the new chart type
+
+      //If none are defined, we'll use a clone of the chart type this is being extended from.
+      //I.e. if we extend a line chart, we'll use the defaults from the line chart if our new chart
+      //doesn't define some defaults of their own.
+
+      var baseDefaults = (Chart.defaults[parent.prototype.name]) ? clone(Chart.defaults[parent.prototype.name]) : {};
+
+      Chart.defaults[chartName] = extend(baseDefaults,extensions.defaults);
+
+      Chart.types[chartName] = ChartType;
+
+      //Register this new chart type in the Chart prototype
+      Chart.prototype[chartName] = function(data,options){
+        var config = merge(Chart.defaults.global, Chart.defaults[chartName], options || {});
+        return new ChartType(data,config,this);
+      };
+    } else{
+      warn("Name not provided for this chart, so it hasn't been registered");
+    }
+    return parent;
+  };
+
+  Chart.Element = function(configuration){
+    extend(this,configuration);
+    this.initialize.apply(this,arguments);
+    this.save();
+  };
+  extend(Chart.Element.prototype,{
+    initialize : function(){},
+    restore : function(props){
+      if (!props){
+        extend(this,this._saved);
+      } else {
+        each(props,function(key){
+          this[key] = this._saved[key];
+        },this);
+      }
+      return this;
+    },
+    save : function(){
+      this._saved = clone(this);
+      delete this._saved._saved;
+      return this;
+    },
+    update : function(newProps){
+      each(newProps,function(value,key){
+        this._saved[key] = this[key];
+        this[key] = value;
+      },this);
+      return this;
+    },
+    transition : function(props,ease){
+      each(props,function(value,key){
+        this[key] = ((value - this._saved[key]) * ease) + this._saved[key];
+      },this);
+      return this;
+    },
+    tooltipPosition : function(){
+      return {
+        x : this.x,
+        y : this.y
+      };
+    }
+  });
+
+  Chart.Element.extend = inherits;
+
+
+  Chart.Point = Chart.Element.extend({
+    inRange : function(chartX,chartY){
+      var hitDetectionRange = this.hitDetectionRadius + this.radius;
+      return ((Math.pow(chartX-this.x, 2)+Math.pow(chartY-this.y, 2)) < Math.pow(hitDetectionRange,2));
+    },
+    draw : function(){
+      var ctx = this.ctx;
+      ctx.beginPath();
+
+      ctx.arc(this.x, this.y, this.radius, 0, Math.PI*2);
+      ctx.closePath();
+
+      ctx.strokeStyle = this.strokeColor;
+      ctx.lineWidth = this.strokeWidth;
+
+      ctx.fillStyle = this.fillColor;
+
+      ctx.fill();
+      ctx.stroke();
+
+
+
+      //Quick debug for bezier curve splining
+      //Highlights control points and the line between them.
+      //Handy for dev - stripped in the min version.
+
+      // ctx.save();
+      // ctx.fillStyle = "black";
+      // ctx.strokeStyle = "black"
+      // ctx.beginPath();
+      // ctx.arc(this.controlPoints.inner.x,this.controlPoints.inner.y, 2, 0, Math.PI*2);
+      // ctx.fill();
+
+      // ctx.beginPath();
+      // ctx.arc(this.controlPoints.outer.x,this.controlPoints.outer.y, 2, 0, Math.PI*2);
+      // ctx.fill();
+
+      // ctx.moveTo(this.controlPoints.inner.x,this.controlPoints.inner.y);
+      // ctx.lineTo(this.controlPoints.outer.x,this.controlPoints.outer.y);
+      // ctx.stroke();
+
+      // ctx.restore();
+
+
+
+    }
+  });
+
+  Chart.Arc = Chart.Element.extend({
+    inRange : function(chartX,chartY){
+
+      var pointRelativePosition = helpers.getAngleFromPoint(this, {
+        x: chartX,
+        y: chartY
+      });
+
+      //Check if within the range of the open/close angle
+      var betweenAngles = (pointRelativePosition.angle >= this.startAngle && pointRelativePosition.angle <= this.endAngle),
+        withinRadius = (pointRelativePosition.distance >= this.innerRadius && pointRelativePosition.distance <= this.outerRadius);
+
+      return (betweenAngles && withinRadius);
+      //Ensure within the outside of the arc centre, but inside arc outer
+    },
+    tooltipPosition : function(){
+      var centreAngle = this.startAngle + ((this.endAngle - this.startAngle) / 2),
+        rangeFromCentre = (this.outerRadius - this.innerRadius) / 2 + this.innerRadius;
+      return {
+        x : this.x + (Math.cos(centreAngle) * rangeFromCentre),
+        y : this.y + (Math.sin(centreAngle) * rangeFromCentre)
+      };
+    },
+    draw : function(animationPercent){
+
+      var easingDecimal = animationPercent || 1;
+
+      var ctx = this.ctx;
+
+      ctx.beginPath();
+
+      ctx.arc(this.x, this.y, this.outerRadius, this.startAngle, this.endAngle);
+
+      ctx.arc(this.x, this.y, this.innerRadius, this.endAngle, this.startAngle, true);
+
+      ctx.closePath();
+      ctx.strokeStyle = this.strokeColor;
+      ctx.lineWidth = this.strokeWidth;
+
+      ctx.fillStyle = this.fillColor;
+
+      ctx.fill();
+      ctx.lineJoin = 'bevel';
+
+      if (this.showStroke){
+        ctx.stroke();
+      }
+    }
+  });
+
+  Chart.Rectangle = Chart.Element.extend({
+    draw : function(){
+      var ctx = this.ctx,
+        halfWidth = this.width/2,
+        leftX = this.x - halfWidth,
+        rightX = this.x + halfWidth,
+        top = this.base - (this.base - this.y),
+        halfStroke = this.strokeWidth / 2;
+
+      // Canvas doesn't allow us to stroke inside the width so we can
+      // adjust the sizes to fit if we're setting a stroke on the line
+      if (this.showStroke){
+        leftX += halfStroke;
+        rightX -= halfStroke;
+        top += halfStroke;
+      }
+
+      ctx.beginPath();
+
+      ctx.fillStyle = this.fillColor;
+      ctx.strokeStyle = this.strokeColor;
+      ctx.lineWidth = this.strokeWidth;
+
+      // It'd be nice to keep this class totally generic to any rectangle
+      // and simply specify which border to miss out.
+      ctx.moveTo(leftX, this.base);
+      ctx.lineTo(leftX, top);
+      ctx.lineTo(rightX, top);
+      ctx.lineTo(rightX, this.base);
+      ctx.fill();
+      if (this.showStroke){
+        ctx.stroke();
+      }
+    },
+    height : function(){
+      return this.base - this.y;
+    },
+    inRange : function(chartX,chartY){
+      return (chartX >= this.x - this.width/2 && chartX <= this.x + this.width/2) && (chartY >= this.y && chartY <= this.base);
+    }
+  });
+
+  Chart.Tooltip = Chart.Element.extend({
+    draw : function(){
+
+      var ctx = this.chart.ctx;
+
+      ctx.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+
+      this.xAlign = "center";
+      this.yAlign = "above";
+
+      //Distance between the actual element.y position and the start of the tooltip caret
+      var caretPadding = 2;
+
+      var tooltipWidth = ctx.measureText(this.text).width + 2*this.xPadding,
+        tooltipRectHeight = this.fontSize + 2*this.yPadding,
+        tooltipHeight = tooltipRectHeight + this.caretHeight + caretPadding;
+
+      if (this.x + tooltipWidth/2 >this.chart.width){
+        this.xAlign = "left";
+      } else if (this.x - tooltipWidth/2 < 0){
+        this.xAlign = "right";
+      }
+
+      if (this.y - tooltipHeight < 0){
+        this.yAlign = "below";
+      }
+
+
+      var tooltipX = this.x - tooltipWidth/2,
+        tooltipY = this.y - tooltipHeight;
+
+      ctx.fillStyle = this.fillColor;
+
+      switch(this.yAlign)
+      {
+      case "above":
+        //Draw a caret above the x/y
+        ctx.beginPath();
+        ctx.moveTo(this.x,this.y - caretPadding);
+        ctx.lineTo(this.x + this.caretHeight, this.y - (caretPadding + this.caretHeight));
+        ctx.lineTo(this.x - this.caretHeight, this.y - (caretPadding + this.caretHeight));
+        ctx.closePath();
+        ctx.fill();
+        break;
+      case "below":
+        tooltipY = this.y + caretPadding + this.caretHeight;
+        //Draw a caret below the x/y
+        ctx.beginPath();
+        ctx.moveTo(this.x, this.y + caretPadding);
+        ctx.lineTo(this.x + this.caretHeight, this.y + caretPadding + this.caretHeight);
+        ctx.lineTo(this.x - this.caretHeight, this.y + caretPadding + this.caretHeight);
+        ctx.closePath();
+        ctx.fill();
+        break;
+      }
+
+      switch(this.xAlign)
+      {
+      case "left":
+        tooltipX = this.x - tooltipWidth + (this.cornerRadius + this.caretHeight);
+        break;
+      case "right":
+        tooltipX = this.x - (this.cornerRadius + this.caretHeight);
+        break;
+      }
+
+      drawRoundedRectangle(ctx,tooltipX,tooltipY,tooltipWidth,tooltipRectHeight,this.cornerRadius);
+
+      ctx.fill();
+
+      ctx.fillStyle = this.textColor;
+      ctx.textAlign = "center";
+      ctx.textBaseline = "middle";
+      ctx.fillText(this.text, tooltipX + tooltipWidth/2, tooltipY + tooltipRectHeight/2);
+    }
+  });
+
+  Chart.MultiTooltip = Chart.Element.extend({
+    initialize : function(){
+      this.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+
+      this.titleFont = fontString(this.titleFontSize,this.titleFontStyle,this.titleFontFamily);
+
+      this.height = (this.labels.length * this.fontSize) + ((this.labels.length-1) * (this.fontSize/2)) + (this.yPadding*2) + this.titleFontSize *1.5;
+
+      this.ctx.font = this.titleFont;
+
+      var titleWidth = this.ctx.measureText(this.title).width,
+        //Label has a legend square as well so account for this.
+        labelWidth = longestText(this.ctx,this.font,this.labels) + this.fontSize + 3,
+        longestTextWidth = max([labelWidth,titleWidth]);
+
+      this.width = longestTextWidth + (this.xPadding*2);
+
+
+      var halfHeight = this.height/2;
+
+      //Check to ensure the height will fit on the canvas
+      //The three is to buffer form the very
+      if (this.y - halfHeight < 0 ){
+        this.y = halfHeight;
+      } else if (this.y + halfHeight > this.chart.height){
+        this.y = this.chart.height - halfHeight;
+      }
+
+      //Decide whether to align left or right based on position on canvas
+      if (this.x > this.chart.width/2){
+        this.x -= this.xOffset + this.width;
+      } else {
+        this.x += this.xOffset;
+      }
+
+
+    },
+    getLineHeight : function(index){
+      var baseLineHeight = this.y - (this.height/2) + this.yPadding,
+        afterTitleIndex = index-1;
+
+      //If the index is zero, we're getting the title
+      if (index === 0){
+        return baseLineHeight + this.titleFontSize/2;
+      } else{
+        return baseLineHeight + ((this.fontSize*1.5*afterTitleIndex) + this.fontSize/2) + this.titleFontSize * 1.5;
+      }
+
+    },
+    draw : function(){
+      drawRoundedRectangle(this.ctx,this.x,this.y - this.height/2,this.width,this.height,this.cornerRadius);
+      var ctx = this.ctx;
+      ctx.fillStyle = this.fillColor;
+      ctx.fill();
+      ctx.closePath();
+
+      ctx.textAlign = "left";
+      ctx.textBaseline = "middle";
+      ctx.fillStyle = this.titleTextColor;
+      ctx.font = this.titleFont;
+
+      ctx.fillText(this.title,this.x + this.xPadding, this.getLineHeight(0));
+
+      ctx.font = this.font;
+      helpers.each(this.labels,function(label,index){
+        ctx.fillStyle = this.textColor;
+        ctx.fillText(label,this.x + this.xPadding + this.fontSize + 3, this.getLineHeight(index + 1));
+
+        //A bit gnarly, but clearing this rectangle breaks when using explorercanvas (clears whole canvas)
+        //ctx.clearRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+        //Instead we'll make a white filled block to put the legendColour palette over.
+
+        ctx.fillStyle = this.legendColorBackground;
+        ctx.fillRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+
+        ctx.fillStyle = this.legendColors[index].fill;
+        ctx.fillRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+
+
+      },this);
+    }
+  });
+
+  Chart.Scale = Chart.Element.extend({
+    initialize : function(){
+      this.fit();
     },
-    easeInExpo: function (t) {
-      return (t==0) ? 1 : 1 * Math.pow(2, 10 * (t/1 - 1));
+    buildYLabels : function(){
+      this.yLabels = [];
+
+      var stepDecimalPlaces = getDecimalPlaces(this.stepValue);
+
+      for (var i=0; i<=this.steps; i++){
+        this.yLabels.push(template(this.templateString,{value:(this.min + (i * this.stepValue)).toFixed(stepDecimalPlaces)}));
+      }
+      this.yLabelWidth = (this.display && this.showLabels) ? longestText(this.ctx,this.font,this.yLabels) : 0;
     },
-    easeOutExpo: function (t) {
-      return (t==1) ? 1 : 1 * (-Math.pow(2, -10 * t/1) + 1);
+    addXLabel : function(label){
+      this.xLabels.push(label);
+      this.valuesCount++;
+      this.fit();
     },
-    easeInOutExpo: function (t) {
-      if (t==0) return 0;
-      if (t==1) return 1;
-      if ((t/=1/2) < 1) return 1/2 * Math.pow(2, 10 * (t - 1));
-      return 1/2 * (-Math.pow(2, -10 * --t) + 2);
-      },
-    easeInCirc: function (t) {
-      if (t>=1) return t;
-      return -1 * (Math.sqrt(1 - (t/=1)*t) - 1);
-    },
-    easeOutCirc: function (t) {
-      return 1 * Math.sqrt(1 - (t=t/1-1)*t);
-    },
-    easeInOutCirc: function (t) {
-      if ((t/=1/2) < 1) return -1/2 * (Math.sqrt(1 - t*t) - 1);
-      return 1/2 * (Math.sqrt(1 - (t-=2)*t) + 1);
-    },
-    easeInElastic: function (t) {
-      var s=1.70158;var p=0;var a=1;
-      if (t==0) return 0;  if ((t/=1)==1) return 1;  if (!p) p=1*.3;
-      if (a < Math.abs(1)) { a=1; var s=p/4; }
-      else var s = p/(2*Math.PI) * Math.asin (1/a);
-      return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*1-s)*(2*Math.PI)/p ));
-    },
-    easeOutElastic: function (t) {
-      var s=1.70158;var p=0;var a=1;
-      if (t==0) return 0;  if ((t/=1)==1) return 1;  if (!p) p=1*.3;
-      if (a < Math.abs(1)) { a=1; var s=p/4; }
-      else var s = p/(2*Math.PI) * Math.asin (1/a);
-      return a*Math.pow(2,-10*t) * Math.sin( (t*1-s)*(2*Math.PI)/p ) + 1;
-    },
-    easeInOutElastic: function (t) {
-      var s=1.70158;var p=0;var a=1;
-      if (t==0) return 0;  if ((t/=1/2)==2) return 1;  if (!p) p=1*(.3*1.5);
-      if (a < Math.abs(1)) { a=1; var s=p/4; }
-      else var s = p/(2*Math.PI) * Math.asin (1/a);
-      if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*1-s)*(2*Math.PI)/p ));
-      return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*1-s)*(2*Math.PI)/p )*.5 + 1;
-    },
-    easeInBack: function (t) {
-      var s = 1.70158;
-      return 1*(t/=1)*t*((s+1)*t - s);
-    },
-    easeOutBack: function (t) {
-      var s = 1.70158;
-      return 1*((t=t/1-1)*t*((s+1)*t + s) + 1);
-    },
-    easeInOutBack: function (t) {
-      var s = 1.70158;
-      if ((t/=1/2) < 1) return 1/2*(t*t*(((s*=(1.525))+1)*t - s));
-      return 1/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2);
-    },
-    easeInBounce: function (t) {
-      return 1 - animationOptions.easeOutBounce (1-t);
-    },
-    easeOutBounce: function (t) {
-      if ((t/=1) < (1/2.75)) {
-        return 1*(7.5625*t*t);
-      } else if (t < (2/2.75)) {
-        return 1*(7.5625*(t-=(1.5/2.75))*t + .75);
-      } else if (t < (2.5/2.75)) {
-        return 1*(7.5625*(t-=(2.25/2.75))*t + .9375);
-      } else {
-        return 1*(7.5625*(t-=(2.625/2.75))*t + .984375);
-      }
+    removeXLabel : function(){
+      this.xLabels.shift();
+      this.valuesCount--;
+      this.fit();
     },
-    easeInOutBounce: function (t) {
-      if (t < 1/2) return animationOptions.easeInBounce (t*2) * .5;
-      return animationOptions.easeOutBounce (t*2-1) * .5 + 1*.5;
-    }
-  };
-
-  this.tooltips = [],
-    defaults = {
-      tooltips: {
-        background: 'rgba(71,74,84,1)',
-        fontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-        fontStyle : "bold",
-        fontColor: 'rgba(255,255,255,1)',
-        fontSize: '11px',
-        labelTemplate: '<%=label%>: <%=value%>',
-        padding: {
-          top: 10,
-          right: 5,
-          bottom: 12,
-          left: 5
-        },
-        offset: {
-          left: 15,
-          top: 0
-        },
-        border: {
-          radius: 3
-        },
-        showHighlight: true,
-        highlight: {
-          stroke: {
-            width: 1,
-            color: 'rgba(255,255,255,0.25)'
-          },
-          fill: 'rgba(255,255,255,0.25)'
+    // Fitting loop to rotate x Labels and figure out what fits there, and also calculate how many Y steps to use
+    fit: function(){
+      // First we need the width of the yLabels, assuming the xLabels aren't rotated
+
+      // To do that we need the base line at the top and base of the chart, assuming there is no x label rotation
+      this.startPoint = (this.display) ? this.fontSize : 0;
+      this.endPoint = (this.display) ? this.height - (this.fontSize * 1.5) - 5 : this.height; // -5 to pad labels
+
+      // Apply padding settings to the start and end point.
+      this.startPoint += this.padding;
+      this.endPoint -= this.padding;
+
+      // Cache the starting height, so can determine if we need to recalculate the scale yAxis
+      var cachedHeight = this.endPoint - this.startPoint,
+        cachedYLabelWidth;
+
+      // Build the current yLabels so we have an idea of what size they'll be to start
+      /*
+       *  This sets what is returned from calculateScaleRange as static properties of this class:
+       *
+        this.steps;
+        this.stepValue;
+        this.min;
+        this.max;
+       *
+       */
+      this.calculateYRange(cachedHeight);
+
+      // With these properties set we can now build the array of yLabels
+      // and also the width of the largest yLabel
+      this.buildYLabels();
+
+      this.calculateXLabelRotation();
+
+      while((cachedHeight > this.endPoint - this.startPoint)){
+        cachedHeight = this.endPoint - this.startPoint;
+        cachedYLabelWidth = this.yLabelWidth;
+
+        this.calculateYRange(cachedHeight);
+        this.buildYLabels();
+
+        // Only go through the xLabel loop again if the yLabel width has changed
+        if (cachedYLabelWidth < this.yLabelWidth){
+          this.calculateXLabelRotation();
         }
       }
+
     },
-    options = (options) ? mergeChartConfig(defaults, options) : defaults;
+    calculateXLabelRotation : function(){
+      //Get the width of each grid by calculating the difference
+      //between x offsets between 0 and 1.
 
-  function registerTooltip(ctx,areaObj,data,type) {
-    chart.tooltips.push(new Tooltip(
-      ctx,
-      areaObj,
-      data,
-      type
-    ));
-  }
+      this.ctx.font = this.font;
 
-  var Tooltip = function(ctx, areaObj, data, type) {
-    this.ctx = ctx;
-    this.areaObj = areaObj;
-    this.data = data;
-    this.savedState = null;
-    this.highlightState = null;
-    this.x = null;
-    this.y = null;
-
-    this.inRange = function(x,y) {
-      if(this.areaObj.type) {
-        switch(this.areaObj.type) {
-          case 'rect':
-            return (x >= this.areaObj.x && x <= this.areaObj.x+this.areaObj.width) &&
-               (y >= this.areaObj.y && y <= this.areaObj.y+this.areaObj.height);
-               break;
-          case 'circle':
-            return ((Math.pow(x-this.areaObj.x, 2)+Math.pow(y-this.areaObj.y, 2)) < Math.pow(this.areaObj.r,2));
-            break;
-          case 'shape':
-            var poly = this.areaObj.points;
-            for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
-              ((poly[i].y <= y && y < poly[j].y) || (poly[j].y <= y && y < poly[i].y))
-              && (x < (poly[j].x - poly[i].x) * (y - poly[i].y) / (poly[j].y - poly[i].y) + poly[i].x)
-              && (c = !c);
-            return c;
-            break;
-        }
-      }
-    }
+      var firstWidth = this.ctx.measureText(this.xLabels[0]).width,
+        lastWidth = this.ctx.measureText(this.xLabels[this.xLabels.length - 1]).width,
+        firstRotated,
+        lastRotated;
 
-    this.render = function(x,y) {
-      if(this.savedState == null) {
-        this.ctx.putImageData(chart.savedState,0,0);
-        this.savedState = this.ctx.getImageData(0,0,this.ctx.canvas.width,this.ctx.canvas.height);
-      }
-      this.ctx.putImageData(this.savedState,0,0);
-      if(options.tooltips.showHighlight) {
-        if(this.highlightState == null) {
-          this.ctx.strokeStyle = options.tooltips.highlight.stroke.color;
-          this.ctx.lineWidth = options.tooltips.highlight.stroke.width;
-          this.ctx.fillStyle = options.tooltips.highlight.fill;
-          switch(this.areaObj.type) {
-            case 'rect':
-              this.ctx.strokeRect(this.areaObj.x, this.areaObj.y, this.areaObj.width, this.areaObj.height);
-              this.ctx.fillStyle = options.tooltips.highlight.fill;
-              this.ctx.fillRect(this.areaObj.x, this.areaObj.y, this.areaObj.width, this.areaObj.height);
-              break;
-            case 'circle':
-              this.ctx.beginPath();
-              this.ctx.arc(this.areaObj.x, this.areaObj.y, this.areaObj.r, 0, 2*Math.PI, false);
-              this.ctx.stroke();
-              this.ctx.fill();
-              break;
-            case 'shape':
-              this.ctx.beginPath();
-              this.ctx.moveTo(this.areaObj.points[0].x, this.areaObj.points[0].y);
-              for(var p in this.areaObj.points) {
-                this.ctx.lineTo(this.areaObj.points[p].x, this.areaObj.points[p].y);
-              }
-              this.ctx.stroke();
-              this.ctx.fill();
-              break;
-          }
-          this.highlightState = this.ctx.getImageData(0,0,this.ctx.canvas.width,this.ctx.canvas.height);
-        } else {
-          this.ctx.putImageData(this.highlightState,0,0);
-        }
-      }
-      //if(this.x != x || this.y != y) {
-        var posX = x+options.tooltips.offset.left,
-          posY = y+options.tooltips.offset.top,
-          tpl = tmpl(options.tooltips.labelTemplate, this.data),
-          rectWidth = options.tooltips.padding.left+this.ctx.measureText(tpl).width+options.tooltips.padding.right;
-        if(posX + rectWidth > this.ctx.canvas.width) {
-          posX -= posX-rectWidth < 0 ? posX : rectWidth;
-        }
-        if(posY + 24 > this.ctx.canvas.height) {
-          posY -= 24;
-        }
-        this.ctx.fillStyle = options.tooltips.background;
-        this.ctx.fillRect(posX, posY, rectWidth, 24);
-        if(options.tooltips.border.width > 0) {
-          this.ctx.fillStyle = options.tooltips.order.color;
-          this.ctx.lineWidth = options.tooltips.border.width;
-          this.ctx.strokeRect(posX, posY, rectWidth, 24);
-        }
-        this.ctx.font = options.tooltips.fontStyle+ " "+options.tooltips.fontSize+" " + options.tooltips.fontFamily;
-        this.ctx.fillStyle = options.tooltips.fontColor;
-        this.ctx.textAlign = 'center';
-        this.ctx.textBaseline = 'middle';
-        this.ctx.fillText(tpl, posX+rectWidth/2, posY+12);
-        this.x = x;
-        this.y = y;
-      //}
-    }
-  }
 
-  //Variables global to the chart
-  var width = context.canvas.width,
-    height = context.canvas.height;
+      this.xScalePaddingRight = lastWidth/2 + 3;
+      this.xScalePaddingLeft = (firstWidth/2 > this.yLabelWidth + 10) ? firstWidth/2 : this.yLabelWidth + 10;
 
-  this.savedState = null;
+      this.xLabelRotation = 0;
+      if (this.display){
+        var originalLabelWidth = longestText(this.ctx,this.font,this.xLabels),
+          cosRotation,
+          firstRotatedWidth;
+        this.xLabelWidth = originalLabelWidth;
+        //Allow 3 pixels x2 padding either side for label readability
+        var xGridWidth = Math.floor(this.calculateX(1) - this.calculateX(0)) - 6;
 
-  function getPosition(e) {
-    var xPosition = 0;
-    var yPosition = 0;
+        //Max label rotate should be 90 - also act as a loop counter
+        while ((this.xLabelWidth > xGridWidth && this.xLabelRotation === 0) || (this.xLabelWidth > xGridWidth && this.xLabelRotation <= 90 && this.xLabelRotation > 0)){
+          cosRotation = Math.cos(toRadians(this.xLabelRotation));
+
+          firstRotated = cosRotation * firstWidth;
+          lastRotated = cosRotation * lastWidth;
+
+          // We're right aligning the text now.
+          if (firstRotated + this.fontSize / 2 > this.yLabelWidth + 8){
+            this.xScalePaddingLeft = firstRotated + this.fontSize / 2;
+          }
+          this.xScalePaddingRight = this.fontSize/2;
 
-    while(e) {
-      xPosition += (e.offsetLeft - e.scrollLeft + e.clientLeft);
-      yPosition += (e.offsetTop - e.scrollTop + e.clientTop);
-      e = e.offsetParent;
-    }
-    return { x: xPosition, y: yPosition };
-  }
 
-  function tooltipEventHandler(e) {
-    if(chart.tooltips.length > 0) {
-      chart.savedState = chart.savedState == null ? context.getImageData(0,0,context.canvas.width,context.canvas.height) : chart.savedState;
-      var rendered = 0;
-      for(var i in chart.tooltips) {
-        var position = getPosition(context.canvas),
-          mx = (e.clientX)-position.x,
-          my = (e.clientY)-position.y;
-        if(chart.tooltips[i].inRange(mx,my)) {
-          chart.tooltips[i].render(mx,my);
-          rendered++;
+          this.xLabelRotation++;
+          this.xLabelWidth = cosRotation * originalLabelWidth;
+
+        }
+        if (this.xLabelRotation > 0){
+          this.endPoint -= Math.sin(toRadians(this.xLabelRotation))*originalLabelWidth + 3;
         }
       }
-      if(rendered == 0) {
-        context.putImageData(chart.savedState,0,0);
+      else{
+        this.xLabelWidth = 0;
+        this.xScalePaddingRight = this.padding;
+        this.xScalePaddingLeft = this.padding;
       }
-    }
-  }
 
-  if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) {
-    context.canvas.ontouchstart = function(e) {
-      e.clientX = e.targetTouches[0].clientX;
-      e.clientY = e.targetTouches[0].clientY;
-      tooltipEventHandler(e);
-    }
-    context.canvas.ontouchmove = function(e) {
-      e.clientX = e.targetTouches[0].clientX;
-      e.clientY = e.targetTouches[0].clientY;
-      tooltipEventHandler(e);
-    }
-  } else {
-    context.canvas.onmousemove = function(e) {
-      tooltipEventHandler(e);
-    }
-  }
-  context.canvas.onmouseout = function(e) {
-    if(chart.savedState != null) {
-      context.putImageData(chart.savedState,0,0);
-    }
-  }
+    },
+    // Needs to be overidden in each Chart type
+    // Otherwise we need to pass all the data into the scale class
+    calculateYRange: noop,
+    drawingArea: function(){
+      return this.startPoint - this.endPoint;
+    },
+    calculateY : function(value){
+      var scalingFactor = this.drawingArea() / (this.min - this.max);
+      return this.endPoint - (scalingFactor * (value - this.min));
+    },
+    calculateX : function(index){
+      var isRotated = (this.xLabelRotation > 0),
+        // innerWidth = (this.offsetGridLines) ? this.width - offsetLeft - this.padding : this.width - (offsetLeft + halfLabelWidth * 2) - this.padding,
+        innerWidth = this.width - (this.xScalePaddingLeft + this.xScalePaddingRight),
+        valueWidth = innerWidth/(this.valuesCount - ((this.offsetGridLines) ? 0 : 1)),
+        valueOffset = (valueWidth * index) + this.xScalePaddingLeft;
+
+      if (this.offsetGridLines){
+        valueOffset += (valueWidth/2);
+      }
 
+      return Math.round(valueOffset);
+    },
+    update : function(newProps){
+      helpers.extend(this, newProps);
+      this.fit();
+    },
+    draw : function(){
+      var ctx = this.ctx,
+        yLabelGap = (this.endPoint - this.startPoint) / this.steps,
+        xStart = Math.round(this.xScalePaddingLeft);
+      if (this.display){
+        ctx.fillStyle = this.textColor;
+        ctx.font = this.font;
+        each(this.yLabels,function(labelString,index){
+          var yLabelCenter = this.endPoint - (yLabelGap * index),
+            linePositionY = Math.round(yLabelCenter);
 
-  //High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
-  if (window.devicePixelRatio) {
-    context.canvas.style.width = width + "px";
-    context.canvas.style.height = height + "px";
-    context.canvas.height = height * window.devicePixelRatio;
-    context.canvas.width = width * window.devicePixelRatio;
-    context.scale(window.devicePixelRatio, window.devicePixelRatio);
-  }
+          ctx.textAlign = "right";
+          ctx.textBaseline = "middle";
+          if (this.showLabels){
+            ctx.fillText(labelString,xStart - 10,yLabelCenter);
+          }
+          ctx.beginPath();
+          if (index > 0){
+            // This is a grid line in the centre, so drop that
+            ctx.lineWidth = this.gridLineWidth;
+            ctx.strokeStyle = this.gridLineColor;
+          } else {
+            // This is the first line on the scale
+            ctx.lineWidth = this.lineWidth;
+            ctx.strokeStyle = this.lineColor;
+          }
 
-  this.PolarArea = function(data,options){
+          linePositionY += helpers.aliasPixel(ctx.lineWidth);
 
-    chart.PolarArea.defaults = {
-      scaleOverlay : true,
-      scaleOverride : false,
-      scaleSteps : null,
-      scaleStepWidth : null,
-      scaleStartValue : null,
-      scaleShowLine : true,
-      scaleLineColor : "rgba(0,0,0,0.1)",
-      scaleLineWidth : 1,
-      scaleShowLabels : true,
-      scaleLabel : "<%=value%>",
-      scaleFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      scaleFontSize : 12,
-      scaleFontStyle : "normal",
-      scaleFontColor : "rgba(71,74,84,1)",
-      scaleShowLabelBackdrop : true,
-      scaleBackdropColor : "rgba(255,255,255,0.75)",
-      scaleBackdropPaddingY : 2,
-      scaleBackdropPaddingX : 2,
-      segmentShowStroke : true,
-      segmentStrokeColor : "#fff",
-      segmentStrokeWidth : 1,
-      animation : true,
-      animationSteps : 100,
-      animationEasing : "easeOutBounce",
-      animateRotate : true,
-      animateScale : false,
-      onAnimationComplete : null,
-      showTooltips : true
-    };
+          ctx.moveTo(xStart, linePositionY);
+          ctx.lineTo(this.width, linePositionY);
+          ctx.stroke();
+          ctx.closePath();
 
-    var config = (options)? mergeChartConfig(chart.PolarArea.defaults,options) : chart.PolarArea.defaults;
+          ctx.lineWidth = this.lineWidth;
+          ctx.strokeStyle = this.lineColor;
+          ctx.beginPath();
+          ctx.moveTo(xStart - 5, linePositionY);
+          ctx.lineTo(xStart, linePositionY);
+          ctx.stroke();
+          ctx.closePath();
 
-    return new PolarArea(data,config,context);
-  };
+        },this);
 
-  this.Radar = function(data,options){
+        each(this.xLabels,function(label,index){
+          var xPos = this.calculateX(index) + aliasPixel(this.lineWidth),
+            // Check to see if line/bar here and decide where to place the line
+            linePos = this.calculateX(index - (this.offsetGridLines ? 0.5 : 0)) + aliasPixel(this.lineWidth),
+            isRotated = (this.xLabelRotation > 0);
 
-    chart.Radar.defaults = {
-      scaleOverlay : false,
-      scaleOverride : false,
-      scaleSteps : null,
-      scaleStepWidth : null,
-      scaleStartValue : null,
-      scaleShowLine : true,
-      scaleLineColor : "rgba(0,0,0,0.1)",
-      scaleLineWidth : 1,
-      scaleShowLabels : false,
-      scaleLabel : "<%=value%>",
-      scaleFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      scaleFontSize : 12,
-      scaleFontStyle : "normal",
-      scaleFontColor : "rgba(71,74,84,1)",
-      scaleShowLabelBackdrop : true,
-      scaleBackdropColor : "rgba(255,255,255,0.75)",
-      scaleBackdropPaddingY : 2,
-      scaleBackdropPaddingX : 2,
-      angleShowLineOut : true,
-      angleLineColor : "rgba(0,0,0,0.1)",
-      angleLineWidth : 1,
-      pointLabelFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      pointLabelFontStyle : "normal",
-      pointLabelFontSize : 12,
-      pointLabelFontColor : "rgba(71,74,84,1)",
-      pointDot : true,
-      pointDotRadius : 3,
-      pointDotStrokeWidth : 1,
-      datasetStroke : true,
-      datasetStrokeWidth : 1,
-      datasetFill : true,
-      animation : true,
-      animationSteps : 60,
-      animationEasing : "easeOutQuart",
-      onAnimationComplete : null,
-      showTooltips : true
-    };
+          ctx.beginPath();
 
-    var config = (options)? mergeChartConfig(chart.Radar.defaults,options) : chart.Radar.defaults;
+          if (index > 0){
+            // This is a grid line in the centre, so drop that
+            ctx.lineWidth = this.gridLineWidth;
+            ctx.strokeStyle = this.gridLineColor;
+          } else {
+            // This is the first line on the scale
+            ctx.lineWidth = this.lineWidth;
+            ctx.strokeStyle = this.lineColor;
+          }
+          ctx.moveTo(linePos,this.endPoint);
+          ctx.lineTo(linePos,this.startPoint - 3);
+          ctx.stroke();
+          ctx.closePath();
 
-    return new Radar(data,config,context);
-  };
 
-  this.Pie = function(data,options){
-    chart.Pie.defaults = {
-      segmentShowStroke : true,
-      segmentStrokeColor : "#fff",
-      segmentStrokeWidth : 1,
-      animation : true,
-      animationSteps : 100,
-      animationEasing : "easeOutBounce",
-      animateRotate : true,
-      animateScale : false,
-      onAnimationComplete : null,
-      labelFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      labelFontStyle : "normal",
-      labelFontSize : 12,
-      labelFontColor : "rgba(71,74,84,1)",
-      labelAlign : 'right',
-      showTooltips : true
-    };
+          ctx.lineWidth = this.lineWidth;
+          ctx.strokeStyle = this.lineColor;
 
-    var config = (options)? mergeChartConfig(chart.Pie.defaults,options) : chart.Pie.defaults;
 
-    return new Pie(data,config,context);
-  };
+          // Small lines at the bottom of the base grid line
+          ctx.beginPath();
+          ctx.moveTo(linePos,this.endPoint);
+          ctx.lineTo(linePos,this.endPoint + 5);
+          ctx.stroke();
+          ctx.closePath();
 
-  this.Doughnut = function(data,options){
-
-    chart.Doughnut.defaults = {
-      segmentShowStroke : true,
-      segmentStrokeColor : "#fff",
-      segmentStrokeWidth : 1,
-      percentageInnerCutout : 50,
-      animation : true,
-      animationSteps : 100,
-      animationEasing : "easeOutBounce",
-      animateRotate : true,
-      animateScale : false,
-      onAnimationComplete : null,
-      showTooltips : true
-    };
+          ctx.save();
+          ctx.translate(xPos,(isRotated) ? this.endPoint + 12 : this.endPoint + 8);
+          ctx.rotate(toRadians(this.xLabelRotation)*-1);
+          ctx.font = this.font;
+          ctx.textAlign = (isRotated) ? "right" : "center";
+          ctx.textBaseline = (isRotated) ? "middle" : "top";
+          ctx.fillText(label, 0, 0);
+          ctx.restore();
+        },this);
 
-    var config = (options)? mergeChartConfig(chart.Doughnut.defaults,options) : chart.Doughnut.defaults;
+      }
+    }
 
-    return new Doughnut(data,config,context);
+  });
 
-  };
+  Chart.RadialScale = Chart.Element.extend({
+    initialize: function(){
+      this.size = min([this.height, this.width]);
+      this.drawingArea = (this.display) ? (this.size/2) - (this.fontSize/2 + this.backdropPaddingY) : (this.size/2);
+    },
+    calculateCenterOffset: function(value){
+      // Take into account half font size + the yPadding of the top value
+      var scalingFactor = this.drawingArea / (this.max - this.min);
 
-  this.Line = function(data,options){
-
-    chart.Line.defaults = {
-      scaleOverlay : false,
-      scaleOverride : false,
-      scaleSteps : null,
-      scaleStepWidth : null,
-      scaleStartValue : null,
-      scaleLineColor : "rgba(0,0,0,0.1)",
-      scaleLineWidth : 1,
-      scaleShowLabels : true,
-      scaleLabel : "<%=value%>",
-      scaleFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      scaleFontSize : 12,
-      scaleFontStyle : "normal",
-      scaleFontColor : "rgba(71,74,84,1)",
-      scaleShowGridLines : true,
-      scaleGridLineColor : "rgba(0,0,0,0.05)",
-      scaleGridLineWidth : 1,
-      bezierCurve : true,
-      pointDot : true,
-      pointDotRadius : 4,
-      pointDotStrokeWidth : 1,
-      datasetStroke : true,
-      datasetStrokeWidth : 1,
-      datasetFill : true,
-      animation : true,
-      animationSteps : 60,
-      animationEasing : "easeOutQuart",
-      onAnimationComplete : null,
-      showTooltips : true
-    };
-    var config = (options) ? mergeChartConfig(chart.Line.defaults,options) : chart.Line.defaults;
+      return (value - this.min) * scalingFactor;
+    },
+    update : function(){
+      if (!this.lineArc){
+        this.setScaleSize();
+      } else {
+        this.drawingArea = (this.display) ? (this.size/2) - (this.fontSize/2 + this.backdropPaddingY) : (this.size/2);
+      }
+      this.buildYLabels();
+    },
+    buildYLabels: function(){
+      this.yLabels = [];
 
-    return new Line(data,config,context);
-  }
+      var stepDecimalPlaces = getDecimalPlaces(this.stepValue);
 
-  this.Bar = function(data,options){
-    chart.Bar.defaults = {
-      scaleOverlay : false,
-      scaleOverride : false,
-      scaleSteps : null,
-      scaleStepWidth : null,
-      scaleStartValue : null,
-      scaleLineColor : "rgba(0,0,0,0.1)",
-      scaleLineWidth : 1,
-      scaleShowLabels : true,
-      scaleLabel : "<%=value%>",
-      scaleFontFamily : "'Gotham', 'Helvetica', Helvetica, Arial, sans-serif",
-      scaleFontSize : 12,
-      scaleFontStyle : "normal",
-      scaleFontColor : "rgba(71,74,84,1)",
-      scaleShowGridLines : true,
-      scaleGridLineColor : "rgba(0,0,0,0.05)",
-      scaleGridLineWidth : 1,
-      barShowStroke : true,
-      barStrokeWidth : 1,
-      barValueSpacing : 5,
-      barDatasetSpacing : 2,
-      animation : true,
-      animationSteps : 60,
-      animationEasing : "easeOutQuart",
-      onAnimationComplete : null,
-      showTooltips : true
-    };
-    var config = (options) ? mergeChartConfig(chart.Bar.defaults,options) : chart.Bar.defaults;
+      for (var i=0; i<=this.steps; i++){
+        this.yLabels.push(template(this.templateString,{value:(this.min + (i * this.stepValue)).toFixed(stepDecimalPlaces)}));
+      }
+    },
+    getCircumference : function(){
+      return ((Math.PI*2) / this.valuesCount);
+    },
+    setScaleSize: function(){
+      /*
+       * Right, this is really confusing and there is a lot of maths going on here
+       * The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
+       *
+       * Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
+       *
+       * Solution:
+       *
+       * We assume the radius of the polygon is half the size of the canvas at first
+       * at each index we check if the text overlaps.
+       *
+       * Where it does, we store that angle and that index.
+       *
+       * After finding the largest index and angle we calculate how much we need to remove
+       * from the shape radius to move the point inwards by that x.
+       *
+       * We average the left and right distances to get the maximum shape radius that can fit in the box
+       * along with labels.
+       *
+       * Once we have that, we can find the centre point for the chart, by taking the x text protrusion
+       * on each side, removing that from the size, halving it and adding the left x protrusion width.
+       *
+       * This will mean we have a shape fitted to the canvas, as large as it can be with the labels
+       * and position it in the most space efficient manner
+       *
+       * https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
+       */
+
+
+      // Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
+      // Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
+      var largestPossibleRadius = min([(this.height/2 - this.pointLabelFontSize - 5), this.width/2]),
+        pointPosition,
+        i,
+        textWidth,
+        halfTextWidth,
+        furthestRight = this.width,
+        furthestRightIndex,
+        furthestRightAngle,
+        furthestLeft = 0,
+        furthestLeftIndex,
+        furthestLeftAngle,
+        xProtrusionLeft,
+        xProtrusionRight,
+        radiusReductionRight,
+        radiusReductionLeft,
+        maxWidthRadius;
+      this.ctx.font = fontString(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily);
+      for (i=0;i<this.valuesCount;i++){
+        // 5px to space the text slightly out - similar to what we do in the draw function.
+        pointPosition = this.getPointPosition(i, largestPossibleRadius);
+        textWidth = this.ctx.measureText(template(this.templateString, { value: this.labels[i] })).width + 5;
+        if (i === 0 || i === this.valuesCount/2){
+          // If we're at index zero, or exactly the middle, we're at exactly the top/bottom
+          // of the radar chart, so text will be aligned centrally, so we'll half it and compare
+          // w/left and right text sizes
+          halfTextWidth = textWidth/2;
+          if (pointPosition.x + halfTextWidth > furthestRight) {
+            furthestRight = pointPosition.x + halfTextWidth;
+            furthestRightIndex = i;
+          }
+          if (pointPosition.x - halfTextWidth < furthestLeft) {
+            furthestLeft = pointPosition.x - halfTextWidth;
+            furthestLeftIndex = i;
+          }
+        }
+        else if (i < this.valuesCount/2) {
+          // Less than half the values means we'll left align the text
+          if (pointPosition.x + textWidth > furthestRight) {
+            furthestRight = pointPosition.x + textWidth;
+            furthestRightIndex = i;
+          }
+        }
+        else if (i > this.valuesCount/2){
+          // More than half the values means we'll right align the text
+          if (pointPosition.x - textWidth < furthestLeft) {
+            furthestLeft = pointPosition.x - textWidth;
+            furthestLeftIndex = i;
+          }
+        }
+      }
 
-    return new Bar(data,config,context);
-  }
+      xProtrusionLeft = furthestLeft;
 
-  var clear = function(c){
-    c.clearRect(0, 0, width, height);
-  };
+      xProtrusionRight = Math.ceil(furthestRight - this.width);
 
-  var PolarArea = function(data,config,ctx){
-    var maxSize, scaleHop, calculatedScale, labelHeight, scaleHeight, valueBounds, labelTemplateString;
+      furthestRightAngle = this.getIndexAngle(furthestRightIndex);
 
+      furthestLeftAngle = this.getIndexAngle(furthestLeftIndex);
 
-    calculateDrawingSizes();
+      radiusReductionRight = xProtrusionRight / Math.sin(furthestRightAngle + Math.PI/2);
 
-    valueBounds = getValueBounds();
+      radiusReductionLeft = xProtrusionLeft / Math.sin(furthestLeftAngle + Math.PI/2);
 
-    labelTemplateString = (config.scaleShowLabels)? config.scaleLabel : null;
+      // Ensure we actually need to reduce the size of the chart
+      radiusReductionRight = (isNumber(radiusReductionRight)) ? radiusReductionRight : 0;
+      radiusReductionLeft = (isNumber(radiusReductionLeft)) ? radiusReductionLeft : 0;
 
-    //Check and set the scale
-    if (!config.scaleOverride){
+      this.drawingArea = largestPossibleRadius - (radiusReductionLeft + radiusReductionRight)/2;
 
-      calculatedScale = calculateScale(scaleHeight,valueBounds.maxSteps,valueBounds.minSteps,valueBounds.maxValue,valueBounds.minValue,labelTemplateString);
-    }
-    else {
-      calculatedScale = {
-        steps : config.scaleSteps,
-        stepValue : config.scaleStepWidth,
-        graphMin : config.scaleStartValue,
-        labels : []
-      }
-      populateLabels(labelTemplateString, calculatedScale.labels,calculatedScale.steps,config.scaleStartValue,config.scaleStepWidth);
-    }
+      //this.drawingArea = min([maxWidthRadius, (this.height - (2 * (this.pointLabelFontSize + 5)))/2])
+      this.setCenterPoint(radiusReductionLeft, radiusReductionRight);
 
-    scaleHop = maxSize/(calculatedScale.steps);
+    },
+    setCenterPoint: function(leftMovement, rightMovement){
 
-    //Wrap in an animation loop wrapper
-    animationLoop(config,drawScale,drawAllSegments,ctx);
+      var maxRight = this.width - rightMovement - this.drawingArea,
+        maxLeft = leftMovement + this.drawingArea;
 
-    function calculateDrawingSizes(){
-      maxSize = (Min([width,height])/2);
-      //Remove whatever is larger - the font size or line width.
+      this.xCenter = (maxLeft + maxRight)/2;
+      // Always vertically in the centre as the text height doesn't change
+      this.yCenter = (this.height/2);
+    },
 
-      maxSize -= Max([config.scaleFontSize*0.5,config.scaleLineWidth*0.5]);
+    getIndexAngle : function(index){
+      var angleMultiplier = (Math.PI * 2) / this.valuesCount;
+      // Start from the top instead of right, so remove a quarter of the circle
 
-      labelHeight = config.scaleFontSize*2;
-      //If we're drawing the backdrop - add the Y padding to the label height and remove from drawing region.
-      if (config.scaleShowLabelBackdrop){
-        labelHeight += (2 * config.scaleBackdropPaddingY);
-        maxSize -= config.scaleBackdropPaddingY*1.5;
-      }
+      return index * angleMultiplier - (Math.PI/2);
+    },
+    getPointPosition : function(index, distanceFromCenter){
+      var thisAngle = this.getIndexAngle(index);
+      return {
+        x : (Math.cos(thisAngle) * distanceFromCenter) + this.xCenter,
+        y : (Math.sin(thisAngle) * distanceFromCenter) + this.yCenter
+      };
+    },
+    draw: function(){
+      if (this.display){
+        var ctx = this.ctx;
+        each(this.yLabels, function(label, index){
+          // Don't draw a centre value
+          if (index > 0){
+            var yCenterOffset = index * (this.drawingArea/this.steps),
+              yHeight = this.yCenter - yCenterOffset,
+              pointPosition;
+
+            // Draw circular lines around the scale
+            if (this.lineWidth > 0){
+              ctx.strokeStyle = this.lineColor;
+              ctx.lineWidth = this.lineWidth;
+
+              if(this.lineArc){
+                ctx.beginPath();
+                ctx.arc(this.xCenter, this.yCenter, yCenterOffset, 0, Math.PI*2);
+                ctx.closePath();
+                ctx.stroke();
+              } else{
+                ctx.beginPath();
+                for (var i=0;i<this.valuesCount;i++)
+                {
+                  pointPosition = this.getPointPosition(i, this.calculateCenterOffset(this.min + (index * this.stepValue)));
+                  if (i === 0){
+                    ctx.moveTo(pointPosition.x, pointPosition.y);
+                  } else {
+                    ctx.lineTo(pointPosition.x, pointPosition.y);
+                  }
+                }
+                ctx.closePath();
+                ctx.stroke();
+              }
+            }
+            if(this.showLabels){
+              ctx.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+              if (this.showLabelBackdrop){
+                var labelWidth = ctx.measureText(label).width;
+                ctx.fillStyle = this.backdropColor;
+                ctx.fillRect(
+                  this.xCenter - labelWidth/2 - this.backdropPaddingX,
+                  yHeight - this.fontSize/2 - this.backdropPaddingY,
+                  labelWidth + this.backdropPaddingX*2,
+                  this.fontSize + this.backdropPaddingY*2
+                );
+              }
+              ctx.textAlign = 'center';
+              ctx.textBaseline = "middle";
+              ctx.fillStyle = this.fontColor;
+              ctx.fillText(label, this.xCenter, yHeight);
+            }
+          }
+        }, this);
+
+        if (!this.lineArc){
+          ctx.lineWidth = this.angleLineWidth;
+          ctx.strokeStyle = this.angleLineColor;
+          for (var i = this.valuesCount - 1; i >= 0; i--) {
+            if (this.angleLineWidth > 0){
+              var outerPosition = this.getPointPosition(i, this.calculateCenterOffset(this.max));
+              ctx.beginPath();
+              ctx.moveTo(this.xCenter, this.yCenter);
+              ctx.lineTo(outerPosition.x, outerPosition.y);
+              ctx.stroke();
+              ctx.closePath();
+            }
+            // Extra 3px out for some label spacing
+            var pointLabelPosition = this.getPointPosition(i, this.calculateCenterOffset(this.max) + 5);
+            ctx.font = fontString(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily);
+            ctx.fillStyle = this.pointLabelFontColor;
+
+            var labelsCount = this.labels.length,
+              halfLabelsCount = this.labels.length/2,
+              quarterLabelsCount = halfLabelsCount/2,
+              upperHalf = (i < quarterLabelsCount || i > labelsCount - quarterLabelsCount),
+              exactQuarter = (i === quarterLabelsCount || i === labelsCount - quarterLabelsCount);
+            if (i === 0){
+              ctx.textAlign = 'center';
+            } else if(i === halfLabelsCount){
+              ctx.textAlign = 'center';
+            } else if (i < halfLabelsCount){
+              ctx.textAlign = 'left';
+            } else {
+              ctx.textAlign = 'right';
+            }
 
-      scaleHeight = maxSize;
-      //If the label height is less than 5, set it to 5 so we don't have lines on top of each other.
-      labelHeight = Default(labelHeight,5);
-    }
-    function drawScale(){
-      for (var i=0; i<calculatedScale.steps; i++){
-        //If the line object is there
-        if (config.scaleShowLine){
-          ctx.beginPath();
-          ctx.arc(width/2, height/2, scaleHop * (i + 1), 0, (Math.PI * 2), true);
-          ctx.strokeStyle = config.scaleLineColor;
-          ctx.lineWidth = config.scaleLineWidth;
-          ctx.stroke();
-        }
+            // Set the correct text baseline based on outer positioning
+            if (exactQuarter){
+              ctx.textBaseline = 'middle';
+            } else if (upperHalf){
+              ctx.textBaseline = 'bottom';
+            } else {
+              ctx.textBaseline = 'top';
+            }
 
-        if (config.scaleShowLabels){
-          ctx.textAlign = "center";
-          ctx.font = config.scaleFontStyle + " " + config.scaleFontSize + "px " + config.scaleFontFamily;
-           var label =  calculatedScale.labels[i];
-          //If the backdrop object is within the font object
-          if (config.scaleShowLabelBackdrop){
-            var textWidth = ctx.measureText(label).width;
-            ctx.fillStyle = config.scaleBackdropColor;
-            ctx.beginPath();
-            ctx.rect(
-              Math.round(width/2 - textWidth/2 - config.scaleBackdropPaddingX),  //X
-              Math.round(height/2 - (scaleHop * (i + 1)) - config.scaleFontSize*0.5 - config.scaleBackdropPaddingY),//Y
-              Math.round(textWidth + (config.scaleBackdropPaddingX*2)), //Width
-              Math.round(config.scaleFontSize + (config.scaleBackdropPaddingY*2)) //Height
-            );
-            ctx.fill();
+            ctx.fillText(this.labels[i], pointLabelPosition.x, pointLabelPosition.y);
           }
-          ctx.textBaseline = "middle";
-          ctx.fillStyle = config.scaleFontColor;
-          ctx.fillText(label,width/2,height/2 - (scaleHop * (i + 1)));
         }
       }
     }
-    function drawAllSegments(animationDecimal){
-      var startAngle = -Math.PI/2,
-      angleStep = (Math.PI*2)/data.length,
-      scaleAnimation = 1,
-      rotateAnimation = 1;
-      if (config.animation) {
-        if (config.animateScale) {
-          scaleAnimation = animationDecimal;
-        }
-        if (config.animateRotate){
-          rotateAnimation = animationDecimal;
-        }
-      }
+  });
+
+  // Attach global event to resize each chart instance when the browser resizes
+  helpers.addEvent(window, "resize", (function(){
+    // Basic debounce of resize function so it doesn't hurt performance when resizing browser.
+    var timeout;
+    return function(){
+      clearTimeout(timeout);
+      timeout = setTimeout(function(){
+        each(Chart.instances,function(instance){
+          // If the responsive flag is set in the chart instance config
+          // Cascade the resize event down to the chart.
+          if (instance.options.responsive){
+            instance.resize(instance.render, true);
+          }
+        });
+      }, 50);
+    };
+  })());
 
-      for (var i=0; i<data.length; i++){
 
-        ctx.beginPath();
-        ctx.arc(width/2,height/2,scaleAnimation * calculateOffset(data[i].value,calculatedScale,scaleHop),startAngle, startAngle + rotateAnimation*angleStep, false);
-        ctx.lineTo(width/2,height/2);
-        ctx.closePath();
-        ctx.fillStyle = data[i].color;
-        ctx.fill();
+  if (amd) {
+    define(function(){
+      return Chart;
+    });
+  }
 
-        if(animationDecimal >= 1 && config.showTooltips) {
-          var points = [{x:width/2,y:height/2}],
-            pAmount = 50,
-            radius = calculateOffset(data[i].value,calculatedScale,scaleHop);
-          points.push({x:width/2+radius*Math.cos(startAngle),y:height/2+radius*Math.sin(startAngle)});
-          for(var p = 0; p <= pAmount; p++) {
-            points.push({x:width/2+radius*Math.cos(startAngle+p/pAmount*rotateAnimation*angleStep),y:height/2+radius*Math.sin(startAngle+p/pAmount*rotateAnimation*angleStep)});
-          }
-          registerTooltip(ctx,{type:'shape',points:points},{label:data[i].label,value:data[i].value},'PolarArea');
-        }
+  root.Chart = Chart;
 
-        if(config.segmentShowStroke){
-          ctx.strokeStyle = config.segmentStrokeColor;
-          ctx.lineWidth = config.segmentStrokeWidth;
-          ctx.stroke();
-        }
-        startAngle += rotateAnimation*angleStep;
-      }
-    }
-    function getValueBounds() {
-      var upperValue = Number.MIN_VALUE;
-      var lowerValue = Number.MAX_VALUE;
-      for (var i=0; i<data.length; i++){
-        if (data[i].value > upperValue) {upperValue = data[i].value;}
-        if (data[i].value < lowerValue) {lowerValue = data[i].value;}
-      };
+  Chart.noConflict = function(){
+    root.Chart = previous;
+    return Chart;
+  };
 
-      var maxSteps = Math.floor((scaleHeight / (labelHeight*0.66)));
-      var minSteps = Math.floor((scaleHeight / labelHeight*0.5));
+}).call(this);
+(function(){
+  "use strict";
 
-      return {
-        maxValue : upperValue,
-        minValue : lowerValue,
-        maxSteps : maxSteps,
-        minSteps : minSteps
-      };
+  var root = this,
+    Chart = root.Chart,
+    helpers = Chart.helpers;
 
 
-    }
-  }
+  var defaultConfig = {
+    //Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
+    scaleBeginAtZero : true,
 
-  var Radar = function (data,config,ctx) {
-    var maxSize, scaleHop, calculatedScale, labelHeight, scaleHeight, valueBounds, labelTemplateString;
+    //Boolean - Whether grid lines are shown across the chart
+    scaleShowGridLines : true,
 
-    //If no labels are defined set to an empty array, so referencing length for looping doesn't blow up.
-    if (!data.labels) data.labels = [];
+    //String - Colour of the grid lines
+    scaleGridLineColor : "rgba(0,0,0,.05)",
 
-    calculateDrawingSizes();
+    //Number - Width of the grid lines
+    scaleGridLineWidth : 1,
 
-    var valueBounds = getValueBounds();
+    //Boolean - If there is a stroke on each bar
+    barShowStroke : true,
 
-    labelTemplateString = (config.scaleShowLabels)? config.scaleLabel : null;
+    //Number - Pixel width of the bar stroke
+    barStrokeWidth : 1,
 
-    //Check and set the scale
-    if (!config.scaleOverride){
+    //Number - Spacing between each of the X value sets
+    barValueSpacing : 5,
 
-      calculatedScale = calculateScale(scaleHeight,valueBounds.maxSteps,valueBounds.minSteps,valueBounds.maxValue,valueBounds.minValue,labelTemplateString);
-    }
-    else {
-      calculatedScale = {
-        steps : config.scaleSteps,
-        stepValue : config.scaleStepWidth,
-        graphMin : config.scaleStartValue,
-        labels : []
-      }
-      populateLabels(labelTemplateString, calculatedScale.labels,calculatedScale.steps,config.scaleStartValue,config.scaleStepWidth);
-    }
+    //Number - Spacing between data sets within X values
+    barDatasetSpacing : 1,
+
+    //String - A legend template
+    legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].fillColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
 
-    scaleHop = maxSize/(calculatedScale.steps);
+  };
 
-    animationLoop(config,drawScale,drawAllDataPoints,ctx);
 
-    //Radar specific functions.
-    function drawAllDataPoints(animationDecimal){
-      var rotationDegree = (2*Math.PI)/data.datasets[0].data.length;
+  Chart.Type.extend({
+    name: "Bar",
+    defaults : defaultConfig,
+    initialize:  function(data){
 
-      ctx.save();
-      //translate to the centre of the canvas.
-      ctx.translate(width/2,height/2);
-      //We accept multiple data sets for radar charts, so show loop through each set
-      for (var i=0; i<data.datasets.length; i++){
-        var offset = calculateOffset(data.datasets[i].data[0],calculatedScale,scaleHop);
-        ctx.beginPath();
-        ctx.moveTo(0,animationDecimal*(-1*offset));
-        if(animationDecimal >= 1 && config.showTooltips) {
-          var curX = width/2+offset*Math.cos(0-Math.PI/2),
-            curY = height/2+offset*Math.sin(0-Math.PI/2),
-            pointRadius = config.pointDot ? config.pointDotRadius+config.pointDotStrokeWidth : 10,
-            ttData = data.labels[0].trim() != "" ? data.labels[0]+": "+data.datasets[i].data[0] : data.datasets[i].data[0];
-          registerTooltip(ctx,{type:'circle',x:curX,y:curY,r:pointRadius},{label:data.labels[0],value:data.datasets[i].data[0]},'Radar');
+      //Expose options as a scope variable here so we can access it in the ScaleClass
+      var options = this.options;
+
+      this.ScaleClass = Chart.Scale.extend({
+        offsetGridLines : true,
+        calculateBarX : function(datasetCount, datasetIndex, barIndex){
+          //Reusable method for calculating the xPosition of a given bar based on datasetIndex & width of the bar
+          var xWidth = this.calculateBaseWidth(),
+            xAbsolute = this.calculateX(barIndex) - (xWidth/2),
+            barWidth = this.calculateBarWidth(datasetCount);
+
+          return xAbsolute + (barWidth * datasetIndex) + (datasetIndex * options.barDatasetSpacing) + barWidth/2;
+        },
+        calculateBaseWidth : function(){
+          return (this.calculateX(1) - this.calculateX(0)) - (2*options.barValueSpacing);
+        },
+        calculateBarWidth : function(datasetCount){
+          //The padding between datasets is to the right of each bar, providing that there are more than 1 dataset
+          var baseWidth = this.calculateBaseWidth() - ((datasetCount - 1) * options.barDatasetSpacing);
+
+          return (baseWidth / datasetCount);
         }
-        for (var j=1; j<data.datasets[i].data.length; j++){
-          offset = calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop);
-          ctx.rotate(rotationDegree);
-          ctx.lineTo(0,animationDecimal*(-1*offset));
-          if(animationDecimal >= 1 && config.showTooltips) {
-            var curX = width/2+offset*Math.cos(j*rotationDegree-Math.PI/2),
-              curY = height/2+offset*Math.sin(j*rotationDegree-Math.PI/2),
-              pointRadius = config.pointDot ? config.pointDotRadius+config.pointDotStrokeWidth : 10,
-              ttData = data.labels[j].trim() != "" ? data.labels[j]+": "+data.datasets[i].data[j] : data.datasets[i].data[j];
-            registerTooltip(ctx,{type:'circle',x:curX,y:curY,r:pointRadius},{label:data.labels[j],value:data.datasets[i].data[j]},'Radar');
+      });
+
+      this.datasets = [];
+
+      //Set up tooltip events on the chart
+      if (this.options.showTooltips){
+        helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+          var activeBars = (evt.type !== 'mouseout') ? this.getBarsAtEvent(evt) : [];
+
+          this.eachBars(function(bar){
+            bar.restore(['fillColor', 'strokeColor']);
+          });
+          helpers.each(activeBars, function(activeBar){
+            activeBar.fillColor = activeBar.highlightFill;
+            activeBar.strokeColor = activeBar.highlightStroke;
+          });
+          this.showTooltip(activeBars);
+        });
+      }
+
+      //Declare the extension of the default point, to cater for the options passed in to the constructor
+      this.BarClass = Chart.Rectangle.extend({
+        strokeWidth : this.options.barStrokeWidth,
+        showStroke : this.options.barShowStroke,
+        ctx : this.chart.ctx
+      });
+
+      //Iterate through each of the datasets, and build this into a property of the chart
+      helpers.each(data.datasets,function(dataset,datasetIndex){
+
+        var datasetObject = {
+          label : dataset.label || null,
+          fillColor : dataset.fillColor,
+          strokeColor : dataset.strokeColor,
+          bars : []
+        };
+
+        this.datasets.push(datasetObject);
+
+        helpers.each(dataset.data,function(dataPoint,index){
+          if (helpers.isNumber(dataPoint)){
+            //Add a new point for each piece of data, passing any required data to draw.
+            datasetObject.bars.push(new this.BarClass({
+              value : dataPoint,
+              label : data.labels[index],
+              strokeColor : dataset.strokeColor,
+              fillColor : dataset.fillColor,
+              highlightFill : dataset.highlightFill || dataset.fillColor,
+              highlightStroke : dataset.highlightStroke || dataset.strokeColor
+            }));
           }
-        }
-        ctx.closePath();
+        },this);
 
+      },this);
 
-        ctx.fillStyle = data.datasets[i].fillColor;
-        ctx.strokeStyle = data.datasets[i].strokeColor;
-        ctx.lineWidth = config.datasetStrokeWidth;
-        ctx.fill();
-        ctx.stroke();
+      this.buildScale(data.labels);
 
+      this.BarClass.prototype.base = this.scale.endPoint;
 
-        if (config.pointDot){
-          ctx.fillStyle = data.datasets[i].pointColor;
-          ctx.strokeStyle = data.datasets[i].pointStrokeColor;
-          ctx.lineWidth = config.pointDotStrokeWidth;
-          for (var k=0; k<data.datasets[i].data.length; k++){
-            ctx.rotate(rotationDegree);
-            ctx.beginPath();
-            ctx.arc(0,animationDecimal*(-1*calculateOffset(data.datasets[i].data[k],calculatedScale,scaleHop)),config.pointDotRadius,2*Math.PI,false);
-            ctx.fill();
-            ctx.stroke();
-          }
+      this.eachBars(function(bar, index, datasetIndex){
+        helpers.extend(bar, {
+          width : this.scale.calculateBarWidth(this.datasets.length),
+          x: this.scale.calculateBarX(this.datasets.length, datasetIndex, index),
+          y: this.scale.endPoint
+        });
+        bar.save();
+      }, this);
+
+      this.render();
+    },
+    update : function(){
+      this.scale.update();
+      // Reset any highlight colours before updating.
+      helpers.each(this.activeElements, function(activeElement){
+        activeElement.restore(['fillColor', 'strokeColor']);
+      });
+
+      this.eachBars(function(bar){
+        bar.save();
+      });
+      this.render();
+    },
+    eachBars : function(callback){
+      helpers.each(this.datasets,function(dataset, datasetIndex){
+        helpers.each(dataset.bars, callback, this, datasetIndex);
+      },this);
+    },
+    getBarsAtEvent : function(e){
+      var barsArray = [],
+        eventPosition = helpers.getRelativePosition(e),
+        datasetIterator = function(dataset){
+          barsArray.push(dataset.bars[barIndex]);
+        },
+        barIndex;
 
+      for (var datasetIndex = 0; datasetIndex < this.datasets.length; datasetIndex++) {
+        for (barIndex = 0; barIndex < this.datasets[datasetIndex].bars.length; barIndex++) {
+          if (this.datasets[datasetIndex].bars[barIndex].inRange(eventPosition.x,eventPosition.y)){
+            helpers.each(this.datasets, datasetIterator);
+            return barsArray;
+          }
         }
-        ctx.rotate(rotationDegree);
       }
-      ctx.restore();
 
+      return barsArray;
+    },
+    buildScale : function(labels){
+      var self = this;
+
+      var dataTotal = function(){
+        var values = [];
+        self.eachBars(function(bar){
+          values.push(bar.value);
+        });
+        return values;
+      };
+
+      var scaleOptions = {
+        templateString : this.options.scaleLabel,
+        height : this.chart.height,
+        width : this.chart.width,
+        ctx : this.chart.ctx,
+        textColor : this.options.scaleFontColor,
+        fontSize : this.options.scaleFontSize,
+        fontStyle : this.options.scaleFontStyle,
+        fontFamily : this.options.scaleFontFamily,
+        valuesCount : labels.length,
+        beginAtZero : this.options.scaleBeginAtZero,
+        integersOnly : this.options.scaleIntegersOnly,
+        calculateYRange: function(currentHeight){
+          var updatedRanges = helpers.calculateScaleRange(
+            dataTotal(),
+            currentHeight,
+            this.fontSize,
+            this.beginAtZero,
+            this.integersOnly
+          );
+          helpers.extend(this, updatedRanges);
+        },
+        xLabels : labels,
+        font : helpers.fontString(this.options.scaleFontSize, this.options.scaleFontStyle, this.options.scaleFontFamily),
+        lineWidth : this.options.scaleLineWidth,
+        lineColor : this.options.scaleLineColor,
+        gridLineWidth : (this.options.scaleShowGridLines) ? this.options.scaleGridLineWidth : 0,
+        gridLineColor : (this.options.scaleShowGridLines) ? this.options.scaleGridLineColor : "rgba(0,0,0,0)",
+        padding : (this.options.showScale) ? 0 : (this.options.barShowStroke) ? this.options.barStrokeWidth : 0,
+        showLabels : this.options.scaleShowLabels,
+        display : this.options.showScale
+      };
+
+      if (this.options.scaleOverride){
+        helpers.extend(scaleOptions, {
+          calculateYRange: helpers.noop,
+          steps: this.options.scaleSteps,
+          stepValue: this.options.scaleStepWidth,
+          min: this.options.scaleStartValue,
+          max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+        });
+      }
+
+      this.scale = new this.ScaleClass(scaleOptions);
+    },
+    addData : function(valuesArray,label){
+      //Map the values array for each of the datasets
+      helpers.each(valuesArray,function(value,datasetIndex){
+          if (helpers.isNumber(value)){
+            //Add a new point for each piece of data, passing any required data to draw.
+            this.datasets[datasetIndex].bars.push(new this.BarClass({
+              value : value,
+              label : label,
+              x: this.scale.calculateBarX(this.datasets.length, datasetIndex, this.scale.valuesCount+1),
+              y: this.scale.endPoint,
+              width : this.scale.calculateBarWidth(this.datasets.length),
+              base : this.scale.endPoint,
+              strokeColor : this.datasets[datasetIndex].strokeColor,
+              fillColor : this.datasets[datasetIndex].fillColor
+            }));
+          }
+      },this);
 
+      this.scale.addXLabel(label);
+      //Then re-render the chart.
+      this.update();
+    },
+    removeData : function(){
+      this.scale.removeXLabel();
+      //Then re-render the chart.
+      helpers.each(this.datasets,function(dataset){
+        dataset.bars.shift();
+      },this);
+      this.update();
+    },
+    reflow : function(){
+      helpers.extend(this.BarClass.prototype,{
+        y: this.scale.endPoint,
+        base : this.scale.endPoint
+      });
+      var newScaleProps = helpers.extend({
+        height : this.chart.height,
+        width : this.chart.width
+      });
+      this.scale.update(newScaleProps);
+    },
+    draw : function(ease){
+      var easingDecimal = ease || 1;
+      this.clear();
+
+      var ctx = this.chart.ctx;
+
+      this.scale.draw(easingDecimal);
+
+      //Draw all the bars for each dataset
+      helpers.each(this.datasets,function(dataset,datasetIndex){
+        helpers.each(dataset.bars,function(bar,index){
+          bar.base = this.scale.endPoint;
+          //Transition then draw
+          bar.transition({
+            x : this.scale.calculateBarX(this.datasets.length, datasetIndex, index),
+            y : this.scale.calculateY(bar.value),
+            width : this.scale.calculateBarWidth(this.datasets.length)
+          }, easingDecimal).draw();
+        },this);
+
+      },this);
     }
-    function drawScale(){
-      var rotationDegree = (2*Math.PI)/data.datasets[0].data.length;
-      ctx.save();
-      ctx.translate(width / 2, height / 2);
+  });
 
-      if (config.angleShowLineOut){
-        ctx.strokeStyle = config.angleLineColor;
-        ctx.lineWidth = config.angleLineWidth;
-        for (var h=0; h<data.datasets[0].data.length; h++){
 
-          ctx.rotate(rotationDegree);
-          ctx.beginPath();
-          ctx.moveTo(0,0);
-          ctx.lineTo(0,-maxSize);
-          ctx.stroke();
-        }
-      }
+}).call(this);
+(function(){
+  "use strict";
 
-      for (var i=0; i<calculatedScale.steps; i++){
-        ctx.beginPath();
+  var root = this,
+    Chart = root.Chart,
+    //Cache a local reference to Chart.helpers
+    helpers = Chart.helpers;
 
-        if(config.scaleShowLine){
-          ctx.strokeStyle = config.scaleLineColor;
-          ctx.lineWidth = config.scaleLineWidth;
-          ctx.moveTo(0,-scaleHop * (i+1));
-          for (var j=0; j<data.datasets[0].data.length; j++){
-            ctx.rotate(rotationDegree);
-            ctx.lineTo(0,-scaleHop * (i+1));
-          }
-          ctx.closePath();
-          ctx.stroke();
+  var defaultConfig = {
+    //Boolean - Whether we should show a stroke on each segment
+    segmentShowStroke : true,
 
-        }
+    //String - The colour of each segment stroke
+    segmentStrokeColor : "rgba(255,255,255,1)",
 
-        if (config.scaleShowLabels){
-          ctx.textAlign = 'center';
-          ctx.font = config.scaleFontStyle + " " + config.scaleFontSize+"px " + config.scaleFontFamily;
-          ctx.textBaseline = "middle";
+    //Number - The width of each segment stroke
+    segmentStrokeWidth : 2,
 
-          if (config.scaleShowLabelBackdrop){
-            var textWidth = ctx.measureText(calculatedScale.labels[i]).width;
-            ctx.fillStyle = config.scaleBackdropColor;
-            ctx.beginPath();
-            ctx.rect(
-              Math.round(- textWidth/2 - config.scaleBackdropPaddingX),  //X
-              Math.round((-scaleHop * (i + 1)) - config.scaleFontSize*0.5 - config.scaleBackdropPaddingY),//Y
-              Math.round(textWidth + (config.scaleBackdropPaddingX*2)), //Width
-              Math.round(config.scaleFontSize + (config.scaleBackdropPaddingY*2)) //Height
-            );
-            ctx.fill();
-          }
-          ctx.fillStyle = config.scaleFontColor;
-          ctx.fillText(calculatedScale.labels[i],0,-scaleHop*(i+1));
-        }
+    //The percentage of the chart that we cut out of the middle.
+    percentageInnerCutout : 50,
 
-      }
-      for (var k=0; k<data.labels.length; k++){
-      ctx.font = config.pointLabelFontStyle + " " + config.pointLabelFontSize+"px " + config.pointLabelFontFamily;
-      ctx.fillStyle = config.pointLabelFontColor;
-        var opposite = Math.sin(rotationDegree*k) * (maxSize + config.pointLabelFontSize);
-        var adjacent = Math.cos(rotationDegree*k) * (maxSize + config.pointLabelFontSize);
-
-        if(rotationDegree*k == Math.PI || rotationDegree*k == 0){
-          ctx.textAlign = "center";
-        }
-        else if(rotationDegree*k > Math.PI){
-          ctx.textAlign = "right";
-        }
-        else{
-          ctx.textAlign = "left";
-        }
+    //Number - Amount of animation steps
+    animationSteps : 100,
 
-        ctx.textBaseline = "middle";
+    //String - Animation easing effect
+    animationEasing : "easeOutBounce",
 
-        ctx.fillText(data.labels[k],opposite,-adjacent);
+    //Boolean - Whether we animate the rotation of the Doughnut
+    animateRotate : true,
 
-      }
-      ctx.restore();
-    };
-    function calculateDrawingSizes(){
-      maxSize = (Min([width,height])/2);
+    //Boolean - Whether we animate scaling the Doughnut from the centre
+    animateScale : false,
 
-      labelHeight = config.scaleFontSize*2;
+    //String - A legend template
+    legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
 
-      var labelLength = 0;
-      for (var i=0; i<data.labels.length; i++){
-        ctx.font = config.pointLabelFontStyle + " " + config.pointLabelFontSize+"px " + config.pointLabelFontFamily;
-        var textMeasurement = ctx.measureText(data.labels[i]).width;
-        if(textMeasurement>labelLength) labelLength = textMeasurement;
-      }
+  };
 
-      //Figure out whats the largest - the height of the text or the width of what's there, and minus it from the maximum usable size.
-      maxSize -= Max([labelLength,((config.pointLabelFontSize/2)*1.5)]);
 
-      maxSize -= config.pointLabelFontSize;
-      maxSize = CapValue(maxSize, null, 0);
-      scaleHeight = maxSize;
-      //If the label height is less than 5, set it to 5 so we don't have lines on top of each other.
-      labelHeight = Default(labelHeight,5);
-    };
-    function getValueBounds() {
-      var upperValue = Number.MIN_VALUE;
-      var lowerValue = Number.MAX_VALUE;
-
-      for (var i=0; i<data.datasets.length; i++){
-        for (var j=0; j<data.datasets[i].data.length; j++){
-          if (data.datasets[i].data[j] > upperValue){upperValue = data.datasets[i].data[j]}
-          if (data.datasets[i].data[j] < lowerValue){lowerValue = data.datasets[i].data[j]}
-        }
+  Chart.Type.extend({
+    //Passing in a name registers this chart in the Chart namespace
+    name: "Doughnut",
+    //Providing a defaults will also register the deafults in the chart namespace
+    defaults : defaultConfig,
+    //Initialize is fired when the chart is initialized - Data is passed in as a parameter
+    //Config is automatically merged by the core of Chart.js, and is available at this.options
+    initialize:  function(data){
+
+      //Declare segments as a static property to prevent inheriting across the Chart type prototype
+      this.segments = [];
+      this.outerRadius = (helpers.min([this.chart.width,this.chart.height]) - this.options.segmentStrokeWidth/2)/2;
+
+      this.SegmentArc = Chart.Arc.extend({
+        ctx : this.chart.ctx,
+        x : this.chart.width/2,
+        y : this.chart.height/2
+      });
+
+      //Set up tooltip events on the chart
+      if (this.options.showTooltips){
+        helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+          var activeSegments = (evt.type !== 'mouseout') ? this.getSegmentsAtEvent(evt) : [];
+
+          helpers.each(this.segments,function(segment){
+            segment.restore(["fillColor"]);
+          });
+          helpers.each(activeSegments,function(activeSegment){
+            activeSegment.fillColor = activeSegment.highlightColor;
+          });
+          this.showTooltip(activeSegments);
+        });
       }
+      this.calculateTotal(data);
 
-      var maxSteps = Math.floor((scaleHeight / (labelHeight*0.66)));
-      var minSteps = Math.floor((scaleHeight / labelHeight*0.5));
-
-      return {
-        maxValue : upperValue,
-        minValue : lowerValue,
-        maxSteps : maxSteps,
-        minSteps : minSteps
-      };
+      helpers.each(data,function(datapoint, index){
+        this.addData(datapoint, index, true);
+      },this);
 
+      this.render();
+    },
+    getSegmentsAtEvent : function(e){
+      var segmentsArray = [];
 
-    }
-  }
+      var location = helpers.getRelativePosition(e);
 
-  var Pie = function(data,config,ctx){
-    var segmentTotal = 0;
+      helpers.each(this.segments,function(segment){
+        if (segment.inRange(location.x,location.y)) segmentsArray.push(segment);
+      },this);
+      return segmentsArray;
+    },
+    addData : function(segment, atIndex, silent){
+      var index = atIndex || this.segments.length;
+      this.segments.splice(index, 0, new this.SegmentArc({
+        value : segment.value,
+        outerRadius : (this.options.animateScale) ? 0 : this.outerRadius,
+        innerRadius : (this.options.animateScale) ? 0 : (this.outerRadius/100) * this.options.percentageInnerCutout,
+        fillColor : segment.color,
+        highlightColor : segment.highlight || segment.color,
+        showStroke : this.options.segmentShowStroke,
+        strokeWidth : this.options.segmentStrokeWidth,
+        strokeColor : this.options.segmentStrokeColor,
+        startAngle : Math.PI * 1.5,
+        circumference : (this.options.animateRotate) ? 0 : this.calculateCircumference(segment.value),
+        label : segment.label
+      }));
+      if (!silent){
+        this.reflow();
+        this.update();
+      }
+    },
+    calculateCircumference : function(value){
+      return (Math.PI*2)*(value / this.total);
+    },
+    calculateTotal : function(data){
+      this.total = 0;
+      helpers.each(data,function(segment){
+        this.total += segment.value;
+      },this);
+    },
+    update : function(){
+      this.calculateTotal(this.segments);
+
+      // Reset any highlight colours before updating.
+      helpers.each(this.activeElements, function(activeElement){
+        activeElement.restore(['fillColor']);
+      });
+
+      helpers.each(this.segments,function(segment){
+        segment.save();
+      });
+      this.render();
+    },
 
-    //In case we have a canvas that is not a square. Minus 5 pixels as padding round the edge.
-    var pieRadius = Min([height/2,width/2]) - 5;
+    removeData: function(atIndex){
+      var indexToDelete = (helpers.isNumber(atIndex)) ? atIndex : this.segments.length-1;
+      this.segments.splice(indexToDelete, 1);
+      this.reflow();
+      this.update();
+    },
 
-    for (var i=0; i<data.length; i++){
-      segmentTotal += data[i].value;
-    }
-    ctx.fillStyle = 'black';
-    ctx.textBaseline = 'base';
-
-    animationLoop(config,null,drawPieSegments,ctx);
-
-    function drawPieSegments (animationDecimal){
-      var cumulativeAngle = -Math.PI/2,
-      scaleAnimation = 1,
-      rotateAnimation = 1;
-      if (config.animation) {
-        if (config.animateScale) {
-          scaleAnimation = animationDecimal;
+    reflow : function(){
+      helpers.extend(this.SegmentArc.prototype,{
+        x : this.chart.width/2,
+        y : this.chart.height/2
+      });
+      this.outerRadius = (helpers.min([this.chart.width,this.chart.height]) - this.options.segmentStrokeWidth/2)/2;
+      helpers.each(this.segments, function(segment){
+        segment.update({
+          outerRadius : this.outerRadius,
+          innerRadius : (this.outerRadius/100) * this.options.percentageInnerCutout
+        });
+      }, this);
+    },
+    draw : function(easeDecimal){
+      var animDecimal = (easeDecimal) ? easeDecimal : 1;
+      this.clear();
+      helpers.each(this.segments,function(segment,index){
+        segment.transition({
+          circumference : this.calculateCircumference(segment.value),
+          outerRadius : this.outerRadius,
+          innerRadius : (this.outerRadius/100) * this.options.percentageInnerCutout
+        },animDecimal);
+
+        segment.endAngle = segment.startAngle + segment.circumference;
+
+        segment.draw();
+        if (index === 0){
+          segment.startAngle = Math.PI * 1.5;
         }
-        if (config.animateRotate){
-          rotateAnimation = animationDecimal;
+        //Check to see if it's the last segment, if not get the next and update the start angle
+        if (index < this.segments.length-1){
+          this.segments[index+1].startAngle = segment.endAngle;
         }
-      }
+      },this);
 
-      for (var i=0; i<data.length; i++){
-        var segmentAngle = rotateAnimation * ((data[i].value/segmentTotal) * (Math.PI*2));
-        ctx.beginPath();
-        ctx.arc(width/2,height/2,scaleAnimation * pieRadius,cumulativeAngle,cumulativeAngle + segmentAngle);
-        ctx.lineTo(width/2,height/2);
-        ctx.closePath();
-        ctx.fillStyle = data[i].color;
-        ctx.fill();
+    }
+  });
 
-        if(data[i].label && scaleAnimation*pieRadius*2*segmentAngle/(2*Math.PI) > config.labelFontSize) {
-          function getPieLabelX(align, r) {
-            switch(align) {
-              case 'left':
-                return -r+20;
-                break;
-              case 'center':
-                return -r/2;
-                break;
-            }
-            return -10;
-          }
+  Chart.types.Doughnut.extend({
+    name : "Pie",
+    defaults : helpers.merge(defaultConfig,{percentageInnerCutout : 0})
+  });
+
+}).call(this);
+(function(){
+  "use strict";
+
+  var root = this,
+    Chart = root.Chart,
+    helpers = Chart.helpers;
+
+  var defaultConfig = {
+
+    ///Boolean - Whether grid lines are shown across the chart
+    scaleShowGridLines : true,
+
+    //String - Colour of the grid lines
+    scaleGridLineColor : "rgba(0,0,0,.05)",
 
-          function reversePieLabelAlign(align) {
-            switch(align) {
-              case 'left': return 'right'; break;
-              case 'right': return 'left'; break;
-              case 'center': return align; break;
-            }
-          }
+    //Number - Width of the grid lines
+    scaleGridLineWidth : 1,
 
-          var fontSize = data[i].labelFontSize || config.labelFontSize+'px';
+    //Boolean - Whether the line is curved between points
+    bezierCurve : true,
 
-          if(fontSize.match(/^[0-9]+$/g) != null) {
-            fontSize = fontSize+'px';
-          }
-          ctx.font = config.labelFontStyle+ " " +fontSize+" " + config.labelFontFamily;
-          ctx.fillStyle = getFadeColor(animationDecimal, data[i].labelColor || 'black', data[i].color);
-          ctx.textBaseline = 'middle';
-          // rotate text, so it perfectly fits in segments
-          var textRotation = -(cumulativeAngle + segmentAngle)+segmentAngle/2,
-            tX = width/2+scaleAnimation*pieRadius*Math.cos(textRotation),
-            tY = height/2-scaleAnimation*pieRadius*Math.sin(textRotation);
-          ctx.textAlign = data[i].labelAlign || config.labelAlign;
-          textX = getPieLabelX(ctx.textAlign, scaleAnimation*pieRadius);
-          if(textRotation < -Math.PI/2) {
-            textRotation -= Math.PI;
-            ctx.textAlign = reversePieLabelAlign(ctx.textAlign);
-            textX = -textX;
-          }
-          ctx.translate(tX, tY);
-          ctx.rotate(-textRotation);
-          ctx.fillText(data[i].label, textX, 0);
-          ctx.rotate(textRotation);
-          ctx.translate(-tX, -tY);
-        }
+    //Number - Tension of the bezier curve between points
+    bezierCurveTension : 0.4,
 
-        if(animationDecimal >= 1 && config.showTooltips) {
-          var points = [{x:width/2,y:height/2}],
-            pAmount = 50;
-          points.push({x:width/2+pieRadius*Math.cos(cumulativeAngle),y:height/2+pieRadius*Math.sin(cumulativeAngle)});
-          for(var p = 0; p <= pAmount; p++) {
-            points.push({x:width/2+pieRadius*Math.cos(cumulativeAngle+p/pAmount*segmentAngle),y:height/2+pieRadius*Math.sin(cumulativeAngle+p/pAmount*segmentAngle)});
-          }
-          registerTooltip(ctx,{type:'shape',points:points},{label:data[i].label,value:data[i].value},'Pie');
-        }
+    //Boolean - Whether to show a dot for each point
+    pointDot : true,
 
-        if(config.segmentShowStroke){
-          ctx.lineWidth = config.segmentStrokeWidth;
-          ctx.strokeStyle = config.segmentStrokeColor;
-          ctx.stroke();
-        }
-        cumulativeAngle += segmentAngle;
-      }
-    }
-  }
+    //Number - Radius of each point dot in pixels
+    pointDotRadius : 4,
 
-  var Doughnut = function(data,config,ctx){
-    var segmentTotal = 0;
+    //Number - Pixel width of point dot stroke
+    pointDotStrokeWidth : 1,
 
-    //In case we have a canvas that is not a square. Minus 5 pixels as padding round the edge.
-    var doughnutRadius = Min([height/2,width/2]) - 5;
+    //Number - amount extra to add to the radius to cater for hit detection outside the drawn point
+    pointHitDetectionRadius : 20,
 
-    var cutoutRadius = doughnutRadius * (config.percentageInnerCutout/100);
+    //Boolean - Whether to show a stroke for datasets
+    datasetStroke : true,
 
-    for (var i=0; i<data.length; i++){
-      segmentTotal += data[i].value;
-    }
+    //Number - Pixel width of dataset stroke
+    datasetStrokeWidth : 1,
+
+    //Boolean - Whether to fill the dataset with a colour
+    datasetFill : true,
 
+    //String - A legend template
+    legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].strokeColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
 
-    animationLoop(config,null,drawPieSegments,ctx);
+  };
 
 
-    function drawPieSegments (animationDecimal){
-      var cumulativeAngle = -Math.PI/2,
-      scaleAnimation = 1,
-      rotateAnimation = 1;
-      if (config.animation) {
-        if (config.animateScale) {
-          scaleAnimation = animationDecimal;
-        }
-        if (config.animateRotate){
-          rotateAnimation = animationDecimal;
+  Chart.Type.extend({
+    name: "Line",
+    defaults : defaultConfig,
+    initialize:  function(data){
+      //Declare the extension of the default point, to cater for the options passed in to the constructor
+      this.PointClass = Chart.Point.extend({
+        strokeWidth : this.options.pointDotStrokeWidth,
+        radius : this.options.pointDotRadius,
+        hitDetectionRadius : this.options.pointHitDetectionRadius,
+        ctx : this.chart.ctx,
+        inRange : function(mouseX){
+          return (Math.pow(mouseX-this.x, 2) < Math.pow(this.radius + this.hitDetectionRadius,2));
         }
+      });
+
+      this.datasets = [];
+
+      //Set up tooltip events on the chart
+      if (this.options.showTooltips){
+        helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+          var activePoints = (evt.type !== 'mouseout') ? this.getPointsAtEvent(evt) : [];
+          this.eachPoints(function(point){
+            point.restore(['fillColor', 'strokeColor']);
+          });
+          helpers.each(activePoints, function(activePoint){
+            activePoint.fillColor = activePoint.highlightFill;
+            activePoint.strokeColor = activePoint.highlightStroke;
+          });
+          this.showTooltip(activePoints);
+        });
       }
-      for (var i=0; i<data.length; i++){
-        var segmentAngle = rotateAnimation * ((data[i].value/segmentTotal) * (Math.PI*2));
-        ctx.beginPath();
-        ctx.arc(width/2,height/2,scaleAnimation * doughnutRadius,cumulativeAngle,cumulativeAngle + segmentAngle,false);
-        ctx.arc(width/2,height/2,scaleAnimation * cutoutRadius,cumulativeAngle + segmentAngle,cumulativeAngle,true);
-        ctx.closePath();
-        ctx.fillStyle = data[i].color;
-        ctx.fill();
 
-        if(animationDecimal >= 1 && config.showTooltips) {
-          var points = [],
-            pAmount = 50;
-          points.push({x:width/2+doughnutRadius*Math.cos(cumulativeAngle),y:height/2+doughnutRadius*Math.sin(cumulativeAngle)});
-          for(var p = 0; p <= pAmount; p++) {
-            points.push({x:width/2+doughnutRadius*Math.cos(cumulativeAngle+p/pAmount*segmentAngle),y:height/2+doughnutRadius*Math.sin(cumulativeAngle+p/pAmount*segmentAngle)});
-          }
-          points.push({x:width/2+cutoutRadius*Math.cos(cumulativeAngle+segmentAngle),y:height/2+cutoutRadius*Math.sin(cumulativeAngle+segmentAngle)});
-          for(var p = pAmount; p >= 0; p--) {
-            points.push({x:width/2+cutoutRadius*Math.cos(cumulativeAngle+p/pAmount*segmentAngle),y:height/2+cutoutRadius*Math.sin(cumulativeAngle+p/pAmount*segmentAngle)});
+      //Iterate through each of the datasets, and build this into a property of the chart
+      helpers.each(data.datasets,function(dataset){
+
+        var datasetObject = {
+          label : dataset.label || null,
+          fillColor : dataset.fillColor,
+          strokeColor : dataset.strokeColor,
+          pointColor : dataset.pointColor,
+          pointStrokeColor : dataset.pointStrokeColor,
+          points : []
+        };
+
+        this.datasets.push(datasetObject);
+
+
+        helpers.each(dataset.data,function(dataPoint,index){
+          //Best way to do this? or in draw sequence...?
+          if (helpers.isNumber(dataPoint)){
+          //Add a new point for each piece of data, passing any required data to draw.
+            datasetObject.points.push(new this.PointClass({
+              value : dataPoint,
+              label : data.labels[index],
+              // x: this.scale.calculateX(index),
+              // y: this.scale.endPoint,
+              strokeColor : dataset.pointStrokeColor,
+              fillColor : dataset.pointColor,
+              highlightFill : dataset.pointHighlightFill || dataset.pointColor,
+              highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
+            }));
           }
-          registerTooltip(ctx,{type:'shape',points:points},{label:data[i].label,value:data[i].value},'Doughnut');
-        }
+        },this);
 
-        if(config.segmentShowStroke){
-          ctx.lineWidth = config.segmentStrokeWidth;
-          ctx.strokeStyle = config.segmentStrokeColor;
-          ctx.stroke();
-        }
-        cumulativeAngle += segmentAngle;
-      }
-    }
+        this.buildScale(data.labels);
 
 
+        this.eachPoints(function(point, index){
+          helpers.extend(point, {
+            x: this.scale.calculateX(index),
+            y: this.scale.endPoint
+          });
+          point.save();
+        }, this);
 
-  }
+      },this);
 
-  var Line = function(data,config,ctx){
-    var maxSize, scaleHop, calculatedScale, labelHeight, scaleHeight, valueBounds, labelTemplateString, valueHop,widestXLabel, xAxisLength,yAxisPosX,xAxisPosY, rotateLabels = 0;
 
-    calculateDrawingSizes();
+      this.render();
+    },
+    update : function(){
+      this.scale.update();
+      // Reset any highlight colours before updating.
+      helpers.each(this.activeElements, function(activeElement){
+        activeElement.restore(['fillColor', 'strokeColor']);
+      });
+      this.eachPoints(function(point){
+        point.save();
+      });
+      this.render();
+    },
+    eachPoints : function(callback){
+      helpers.each(this.datasets,function(dataset){
+        helpers.each(dataset.points,callback,this);
+      },this);
+    },
+    getPointsAtEvent : function(e){
+      var pointsArray = [],
+        eventPosition = helpers.getRelativePosition(e);
+      helpers.each(this.datasets,function(dataset){
+        helpers.each(dataset.points,function(point){
+          if (point.inRange(eventPosition.x,eventPosition.y)) pointsArray.push(point);
+        });
+      },this);
+      return pointsArray;
+    },
+    buildScale : function(labels){
+      var self = this;
 
-    valueBounds = getValueBounds();
-    //Check and set the scale
-    labelTemplateString = (config.scaleShowLabels)? config.scaleLabel : "";
-    if (!config.scaleOverride){
+      var dataTotal = function(){
+        var values = [];
+        self.eachPoints(function(point){
+          values.push(point.value);
+        });
 
-      calculatedScale = calculateScale(scaleHeight,valueBounds.maxSteps,valueBounds.minSteps,valueBounds.maxValue,valueBounds.minValue,labelTemplateString);
-    }
-    else {
-      calculatedScale = {
-        steps : config.scaleSteps,
-        stepValue : config.scaleStepWidth,
-        graphMin : config.scaleStartValue,
-        labels : []
-      }
-      populateLabels(labelTemplateString, calculatedScale.labels,calculatedScale.steps,config.scaleStartValue,config.scaleStepWidth);
-    }
+        return values;
+      };
 
-    scaleHop = Math.floor(scaleHeight/calculatedScale.steps);
-    calculateXAxisSize();
-    animationLoop(config,drawScale,drawLines,ctx);
+      var scaleOptions = {
+        templateString : this.options.scaleLabel,
+        height : this.chart.height,
+        width : this.chart.width,
+        ctx : this.chart.ctx,
+        textColor : this.options.scaleFontColor,
+        fontSize : this.options.scaleFontSize,
+        fontStyle : this.options.scaleFontStyle,
+        fontFamily : this.options.scaleFontFamily,
+        valuesCount : labels.length,
+        beginAtZero : this.options.scaleBeginAtZero,
+        integersOnly : this.options.scaleIntegersOnly,
+        calculateYRange : function(currentHeight){
+          var updatedRanges = helpers.calculateScaleRange(
+            dataTotal(),
+            currentHeight,
+            this.fontSize,
+            this.beginAtZero,
+            this.integersOnly
+          );
+          helpers.extend(this, updatedRanges);
+        },
+        xLabels : labels,
+        font : helpers.fontString(this.options.scaleFontSize, this.options.scaleFontStyle, this.options.scaleFontFamily),
+        lineWidth : this.options.scaleLineWidth,
+        lineColor : this.options.scaleLineColor,
+        gridLineWidth : (this.options.scaleShowGridLines) ? this.options.scaleGridLineWidth : 0,
+        gridLineColor : (this.options.scaleShowGridLines) ? this.options.scaleGridLineColor : "rgba(0,0,0,0)",
+        padding: (this.options.showScale) ? 0 : this.options.pointDotRadius + this.options.pointDotStrokeWidth,
+        showLabels : this.options.scaleShowLabels,
+        display : this.options.showScale
+      };
 
-    function drawLines(animPc){
-      for (var i=0; i<data.datasets.length; i++){
-        ctx.strokeStyle = data.datasets[i].strokeColor;
-        ctx.lineWidth = config.datasetStrokeWidth;
-        ctx.beginPath();
-        ctx.moveTo(yAxisPosX, xAxisPosY - animPc*(calculateOffset(data.datasets[i].data[0],calculatedScale,scaleHop)))
+      if (this.options.scaleOverride){
+        helpers.extend(scaleOptions, {
+          calculateYRange: helpers.noop,
+          steps: this.options.scaleSteps,
+          stepValue: this.options.scaleStepWidth,
+          min: this.options.scaleStartValue,
+          max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+        });
+      }
 
-        for (var j=1; j<data.datasets[i].data.length; j++){
-          if (config.bezierCurve){
-            ctx.bezierCurveTo(xPos(j-0.5),yPos(i,j-1),xPos(j-0.5),yPos(i,j),xPos(j),yPos(i,j));
-          }
-          else{
-            ctx.lineTo(xPos(j),yPos(i,j));
-          }
-        }
-        var pointRadius = config.pointDot ? config.pointDotRadius+config.pointDotStrokeWidth : 10;
-        for(var j = 0; j < data.datasets[i].data.length; j++) {
-          if(animPc >= 1 && config.showTooltips) {
-            // register tooltips
-            registerTooltip(ctx,{type:'circle',x:xPos(j),y:yPos(i,j),r:pointRadius},{label:data.labels[j],value:data.datasets[i].data[j]},'Line');
-          }
-        }
-        ctx.stroke();
-        if (config.datasetFill){
-          ctx.lineTo(yAxisPosX + (valueHop*(data.datasets[i].data.length-1)),xAxisPosY);
-          ctx.lineTo(yAxisPosX,xAxisPosY);
-          ctx.closePath();
-          ctx.fillStyle = data.datasets[i].fillColor;
-          ctx.fill();
-        }
-        else{
-          ctx.closePath();
-        }
-        if(config.pointDot){
-          ctx.fillStyle = data.datasets[i].pointColor;
-          ctx.strokeStyle = data.datasets[i].pointStrokeColor;
-          ctx.lineWidth = config.pointDotStrokeWidth;
-          for (var k=0; k<data.datasets[i].data.length; k++){
-            ctx.beginPath();
-            ctx.arc(yAxisPosX + (valueHop *k),xAxisPosY - animPc*(calculateOffset(data.datasets[i].data[k],calculatedScale,scaleHop)),config.pointDotRadius,0,Math.PI*2,true);
-            ctx.fill();
-            ctx.stroke();
+
+      this.scale = new Chart.Scale(scaleOptions);
+    },
+    addData : function(valuesArray,label){
+      //Map the values array for each of the datasets
+
+      helpers.each(valuesArray,function(value,datasetIndex){
+          if (helpers.isNumber(value)){
+          //Add a new point for each piece of data, passing any required data to draw.
+            this.datasets[datasetIndex].points.push(new this.PointClass({
+              value : value,
+              label : label,
+              x: this.scale.calculateX(this.scale.valuesCount+1),
+              y: this.scale.endPoint,
+              strokeColor : this.datasets[datasetIndex].pointStrokeColor,
+              fillColor : this.datasets[datasetIndex].pointColor
+            }));
           }
-        }
-      }
+      },this);
 
-      function yPos(dataSet,iteration){
-        return xAxisPosY - animPc*(calculateOffset(data.datasets[dataSet].data[iteration],calculatedScale,scaleHop));
-      }
-      function xPos(iteration){
-        return yAxisPosX + (valueHop * iteration);
-      }
-    }
-    function drawScale(){
-      //X axis line
-      ctx.lineWidth = config.scaleLineWidth;
-      ctx.strokeStyle = config.scaleLineColor;
-      ctx.beginPath();
-      ctx.moveTo(width-widestXLabel/2+5,xAxisPosY);
-      ctx.lineTo(width-(widestXLabel/2)-xAxisLength-5,xAxisPosY);
-      ctx.stroke();
+      this.scale.addXLabel(label);
+      //Then re-render the chart.
+      this.update();
+    },
+    removeData : function(){
+      this.scale.removeXLabel();
+      //Then re-render the chart.
+      helpers.each(this.datasets,function(dataset){
+        dataset.points.shift();
+      },this);
+      this.update();
+    },
+    reflow : function(){
+      var newScaleProps = helpers.extend({
+        height : this.chart.height,
+        width : this.chart.width
+      });
+      this.scale.update(newScaleProps);
+    },
+    draw : function(ease){
+      var easingDecimal = ease || 1;
+      this.clear();
 
+      var ctx = this.chart.ctx;
 
-      if (rotateLabels > 0){
-        ctx.save();
-        ctx.textAlign = "right";
-      }
-      else{
-        ctx.textAlign = "center";
-      }
-      ctx.fillStyle = config.scaleFontColor;
-      for (var i=0; i<data.labels.length; i++){
-        ctx.save();
-        if (rotateLabels > 0){
-          ctx.translate(yAxisPosX + i*valueHop,xAxisPosY + config.scaleFontSize);
-          ctx.rotate(-(rotateLabels * (Math.PI/180)));
-          ctx.fillText(data.labels[i], 0,0);
-          ctx.restore();
-        }
+      this.scale.draw(easingDecimal);
 
-        else{
-          ctx.fillText(data.labels[i], yAxisPosX + i*valueHop,xAxisPosY + config.scaleFontSize+3);
-        }
 
-        ctx.beginPath();
-        ctx.moveTo(yAxisPosX + i * valueHop, xAxisPosY+3);
+      helpers.each(this.datasets,function(dataset){
 
-        //Check i isnt 0, so we dont go over the Y axis twice.
-        if(config.scaleShowGridLines && i>0){
-          ctx.lineWidth = config.scaleGridLineWidth;
-          ctx.strokeStyle = config.scaleGridLineColor;
-          ctx.lineTo(yAxisPosX + i * valueHop, 5);
-        }
-        else{
-          ctx.lineTo(yAxisPosX + i * valueHop, xAxisPosY+3);
+        //Transition each point first so that the line and point drawing isn't out of sync
+        //We can use this extra loop to calculate the control points of this dataset also in this loop
+
+        helpers.each(dataset.points,function(point,index){
+          point.transition({
+            y : this.scale.calculateY(point.value),
+            x : this.scale.calculateX(index)
+          }, easingDecimal);
+
+        },this);
+
+
+        // Control points need to be calculated in a seperate loop, because we need to know the current x/y of the point
+        // This would cause issues when there is no animation, because the y of the next point would be 0, so beziers would be skewed
+        if (this.options.bezierCurve){
+          helpers.each(dataset.points,function(point,index){
+            //If we're at the start or end, we don't have a previous/next point
+            //By setting the tension to 0 here, the curve will transition to straight at the end
+            if (index === 0){
+              point.controlPoints = helpers.splineCurve(point,point,dataset.points[index+1],0);
+            }
+            else if (index >= dataset.points.length-1){
+              point.controlPoints = helpers.splineCurve(dataset.points[index-1],point,point,0);
+            }
+            else{
+              point.controlPoints = helpers.splineCurve(dataset.points[index-1],point,dataset.points[index+1],this.options.bezierCurveTension);
+            }
+          },this);
         }
-        ctx.stroke();
-      }
 
-      //Y axis
-      ctx.lineWidth = config.scaleLineWidth;
-      ctx.strokeStyle = config.scaleLineColor;
-      ctx.beginPath();
-      ctx.moveTo(yAxisPosX,xAxisPosY+5);
-      ctx.lineTo(yAxisPosX,5);
-      ctx.stroke();
 
-      ctx.textAlign = "right";
-      ctx.textBaseline = "middle";
-      for (var j=0; j<calculatedScale.steps; j++){
+        //Draw the line between all the points
+        ctx.lineWidth = this.options.datasetStrokeWidth;
+        ctx.strokeStyle = dataset.strokeColor;
         ctx.beginPath();
-        ctx.moveTo(yAxisPosX-3,xAxisPosY - ((j+1) * scaleHop));
-        if (config.scaleShowGridLines){
-          ctx.lineWidth = config.scaleGridLineWidth;
-          ctx.strokeStyle = config.scaleGridLineColor;
-          ctx.lineTo(yAxisPosX + xAxisLength + 5,xAxisPosY - ((j+1) * scaleHop));
-        }
-        else{
-          ctx.lineTo(yAxisPosX-0.5,xAxisPosY - ((j+1) * scaleHop));
-        }
+        helpers.each(dataset.points,function(point,index){
+          if (index>0){
+            if(this.options.bezierCurve){
+              ctx.bezierCurveTo(
+                dataset.points[index-1].controlPoints.outer.x,
+                dataset.points[index-1].controlPoints.outer.y,
+                point.controlPoints.inner.x,
+                point.controlPoints.inner.y,
+                point.x,
+                point.y
+              );
+            }
+            else{
+              ctx.lineTo(point.x,point.y);
+            }
 
+          }
+          else{
+            ctx.moveTo(point.x,point.y);
+          }
+        },this);
         ctx.stroke();
 
-        if (config.scaleShowLabels){
-          ctx.fillText(calculatedScale.labels[j],yAxisPosX-8,xAxisPosY - ((j+1) * scaleHop));
-        }
-      }
-
 
-    }
-    function calculateXAxisSize(){
-      var longestText = 1;
-      //if we are showing the labels
-      if (config.scaleShowLabels){
-        ctx.font = config.scaleFontStyle + " " + config.scaleFontSize+"px " + config.scaleFontFamily;
-        for (var i=0; i<calculatedScale.labels.length; i++){
-          var measuredText = ctx.measureText(calculatedScale.labels[i]).width;
-          longestText = (measuredText > longestText)? measuredText : longestText;
+        if (this.options.datasetFill){
+          //Round off the line by going to the base of the chart, back to the start, then fill.
+          ctx.lineTo(dataset.points[dataset.points.length-1].x, this.scale.endPoint);
+          ctx.lineTo(this.scale.calculateX(0), this.scale.endPoint);
+          ctx.fillStyle = dataset.fillColor;
+          ctx.closePath();
+          ctx.fill();
         }
-        //Add a little extra padding from the y axis
-        longestText +=10;
-      }
-      xAxisLength = width - longestText - widestXLabel;
-      valueHop = Math.floor(xAxisLength/(data.labels.length-1));
 
-      yAxisPosX = width-widestXLabel/2-xAxisLength;
-      xAxisPosY = scaleHeight + config.scaleFontSize/2;
+        //Now draw the points over the line
+        //A little inefficient double looping, but better than the line
+        //lagging behind the point positions
+        helpers.each(dataset.points,function(point){
+          point.draw();
+        });
+
+      },this);
     }
-    function calculateDrawingSizes(){
-      maxSize = height;
-
-      //Need to check the X axis first - measure the length of each text metric, and figure out if we need to rotate by 45 degrees.
-      ctx.font = config.scaleFontStyle + " " + config.scaleFontSize+"px " + config.scaleFontFamily;
-      widestXLabel = 1;
-      for (var i=0; i<data.labels.length; i++){
-        var textLength = ctx.measureText(data.labels[i]).width;
-        //If the text length is longer - make that equal to longest text!
-        widestXLabel = (textLength > widestXLabel)? textLength : widestXLabel;
-      }
-      if (width/data.labels.length < widestXLabel){
-        rotateLabels = 45;
-        if (width/data.labels.length < Math.cos(rotateLabels) * widestXLabel){
-          rotateLabels = 90;
-          maxSize -= widestXLabel;
-        }
-        else{
-          maxSize -= Math.sin(rotateLabels) * widestXLabel;
-        }
-      }
-      else{
-        maxSize -= config.scaleFontSize;
-      }
+  });
 
-      //Add a little padding between the x line and the text
-      maxSize -= 5;
 
+}).call(this);
+(function(){
+  "use strict";
 
-      labelHeight = config.scaleFontSize;
+  var root = this,
+    Chart = root.Chart,
+    //Cache a local reference to Chart.helpers
+    helpers = Chart.helpers;
 
-      maxSize -= labelHeight;
-      //Set 5 pixels greater than the font size to allow for a little padding from the X axis.
+  var defaultConfig = {
+    //Boolean - Show a backdrop to the scale label
+    scaleShowLabelBackdrop : true,
 
-      scaleHeight = maxSize;
+    //String - The colour of the label backdrop
+    scaleBackdropColor : "rgba(255,255,255,0.75)",
 
-      //Then get the area above we can safely draw on.
+    // Boolean - Whether the scale should begin at zero
+    scaleBeginAtZero : true,
 
-    }
-    function getValueBounds() {
-      var upperValue = Number.MIN_VALUE;
-      var lowerValue = Number.MAX_VALUE;
-      for (var i=0; i<data.datasets.length; i++){
-        for (var j=0; j<data.datasets[i].data.length; j++){
-          if ( data.datasets[i].data[j] > upperValue) { upperValue = data.datasets[i].data[j] };
-          if ( data.datasets[i].data[j] < lowerValue) { lowerValue = data.datasets[i].data[j] };
-        }
-      };
+    //Number - The backdrop padding above & below the label in pixels
+    scaleBackdropPaddingY : 2,
 
-      var maxSteps = Math.floor((scaleHeight / (labelHeight*0.66)));
-      var minSteps = Math.floor((scaleHeight / labelHeight*0.5));
+    //Number - The backdrop padding to the side of the label in pixels
+    scaleBackdropPaddingX : 2,
 
-      return {
-        maxValue : upperValue,
-        minValue : lowerValue,
-        maxSteps : maxSteps,
-        minSteps : minSteps
-      };
+    //Boolean - Show line for each value in the scale
+    scaleShowLine : true,
 
+    //Boolean - Stroke a line around each segment in the chart
+    segmentShowStroke : true,
 
-    }
+    //String - The colour of the stroke on each segement.
+    segmentStrokeColor : "rgba(255,255,255,1)",
 
+    //Number - The width of the stroke value in pixels
+    segmentStrokeWidth : 2,
 
-  }
+    //Number - Amount of animation steps
+    animationSteps : 100,
 
-  var Bar = function(data,config,ctx){
-    var maxSize, scaleHop, calculatedScale, labelHeight, scaleHeight, valueBounds, labelTemplateString, valueHop,widestXLabel, xAxisLength,yAxisPosX,xAxisPosY,barWidth, rotateLabels = 0;
+    //String - Animation easing effect.
+    animationEasing : "easeOutBounce",
 
-    calculateDrawingSizes();
+    //Boolean - Whether to animate the rotation of the chart
+    animateRotate : true,
 
-    valueBounds = getValueBounds();
-    //Check and set the scale
-    labelTemplateString = (config.scaleShowLabels)? config.scaleLabel : "";
-    if (!config.scaleOverride){
+    //Boolean - Whether to animate scaling the chart from the centre
+    animateScale : false,
 
-      calculatedScale = calculateScale(scaleHeight,valueBounds.maxSteps,valueBounds.minSteps,valueBounds.maxValue,valueBounds.minValue,labelTemplateString);
-    }
-    else {
-      calculatedScale = {
-        steps : config.scaleSteps,
-        stepValue : config.scaleStepWidth,
-        graphMin : config.scaleStartValue,
-        labels : []
-      }
-      populateLabels(labelTemplateString, calculatedScale.labels,calculatedScale.steps,config.scaleStartValue,config.scaleStepWidth);
-    }
+    //String - A legend template
+    legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
+  };
 
-    scaleHop = Math.floor(scaleHeight/calculatedScale.steps);
-    calculateXAxisSize();
-    animationLoop(config,drawScale,drawBars,ctx);
-
-    function drawBars(animPc){
-      ctx.lineWidth = config.barStrokeWidth;
-      for (var i=0; i<data.datasets.length; i++){
-        for (var j=0; j<data.datasets[i].data.length; j++){
-          var barOffset = yAxisPosX + config.barValueSpacing + valueHop*j + barWidth*i + config.barDatasetSpacing*i + config.barStrokeWidth*i;
-          ctx.fillStyle = cycleColor(data.datasets[i].fillColor, j);
-          ctx.strokeStyle = cycleColor(data.datasets[i].strokeColor, j);
-          ctx.beginPath();
-          ctx.moveTo(barOffset, xAxisPosY);
-          ctx.lineTo(barOffset, xAxisPosY - animPc*calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop)+(config.barStrokeWidth/2));
-          ctx.lineTo(barOffset + barWidth, xAxisPosY - animPc*calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop)+(config.barStrokeWidth/2));
-          ctx.lineTo(barOffset + barWidth, xAxisPosY);
-          if(config.barShowStroke){
-            ctx.stroke();
-          }
-          ctx.closePath();
-          ctx.fill();
 
-          if(animPc >= 1 && config.showTooltips) {
-            // register tooltips
-            var x = barOffset,
-              height = calculateOffset(data.datasets[i].data[j],calculatedScale,scaleHop),
-              y = xAxisPosY-height,
-              width = barWidth;
-            registerTooltip(ctx,{type:'rect',x:x,y:y,width:width,height:height},{label:data.labels[j],value:data.datasets[i].data[j]},'Bar');
-          }
-        }
+  Chart.Type.extend({
+    //Passing in a name registers this chart in the Chart namespace
+    name: "PolarArea",
+    //Providing a defaults will also register the deafults in the chart namespace
+    defaults : defaultConfig,
+    //Initialize is fired when the chart is initialized - Data is passed in as a parameter
+    //Config is automatically merged by the core of Chart.js, and is available at this.options
+    initialize:  function(data){
+      this.segments = [];
+      //Declare segment class as a chart instance specific class, so it can share props for this instance
+      this.SegmentArc = Chart.Arc.extend({
+        showStroke : this.options.segmentShowStroke,
+        strokeWidth : this.options.segmentStrokeWidth,
+        strokeColor : this.options.segmentStrokeColor,
+        ctx : this.chart.ctx,
+        innerRadius : 0,
+        x : this.chart.width/2,
+        y : this.chart.height/2
+      });
+      this.scale = new Chart.RadialScale({
+        display: this.options.showScale,
+        fontStyle: this.options.scaleFontStyle,
+        fontSize: this.options.scaleFontSize,
+        fontFamily: this.options.scaleFontFamily,
+        fontColor: this.options.scaleFontColor,
+        showLabels: this.options.scaleShowLabels,
+        showLabelBackdrop: this.options.scaleShowLabelBackdrop,
+        backdropColor: this.options.scaleBackdropColor,
+        backdropPaddingY : this.options.scaleBackdropPaddingY,
+        backdropPaddingX: this.options.scaleBackdropPaddingX,
+        lineWidth: (this.options.scaleShowLine) ? this.options.scaleLineWidth : 0,
+        lineColor: this.options.scaleLineColor,
+        lineArc: true,
+        width: this.chart.width,
+        height: this.chart.height,
+        xCenter: this.chart.width/2,
+        yCenter: this.chart.height/2,
+        ctx : this.chart.ctx,
+        templateString: this.options.scaleLabel,
+        valuesCount: data.length
+      });
+
+      this.updateScaleRange(data);
+
+      this.scale.update();
+
+      helpers.each(data,function(segment,index){
+        this.addData(segment,index,true);
+      },this);
+
+      //Set up tooltip events on the chart
+      if (this.options.showTooltips){
+        helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+          var activeSegments = (evt.type !== 'mouseout') ? this.getSegmentsAtEvent(evt) : [];
+          helpers.each(this.segments,function(segment){
+            segment.restore(["fillColor"]);
+          });
+          helpers.each(activeSegments,function(activeSegment){
+            activeSegment.fillColor = activeSegment.highlightColor;
+          });
+          this.showTooltip(activeSegments);
+        });
       }
 
-    }
-    function drawScale(){
-      //X axis line
-      ctx.lineWidth = config.scaleLineWidth;
-      ctx.strokeStyle = config.scaleLineColor;
-      ctx.beginPath();
-      ctx.moveTo(width-widestXLabel/2+5,xAxisPosY);
-      ctx.lineTo(width-(widestXLabel/2)-xAxisLength-5,xAxisPosY);
-      ctx.stroke();
+      this.render();
+    },
+    getSegmentsAtEvent : function(e){
+      var segmentsArray = [];
 
+      var location = helpers.getRelativePosition(e);
 
-      if (rotateLabels > 0){
-        ctx.save();
-        ctx.textAlign = "right";
-      }
-      else{
-        ctx.textAlign = "center";
+      helpers.each(this.segments,function(segment){
+        if (segment.inRange(location.x,location.y)) segmentsArray.push(segment);
+      },this);
+      return segmentsArray;
+    },
+    addData : function(segment, atIndex, silent){
+      var index = atIndex || this.segments.length;
+
+      this.segments.splice(index, 0, new this.SegmentArc({
+        fillColor: segment.color,
+        highlightColor: segment.highlight || segment.color,
+        label: segment.label,
+        value: segment.value,
+        outerRadius: (this.options.animateScale) ? 0 : this.scale.calculateCenterOffset(segment.value),
+        circumference: (this.options.animateRotate) ? 0 : this.scale.getCircumference(),
+        startAngle: Math.PI * 1.5
+      }));
+      if (!silent){
+        this.reflow();
+        this.update();
       }
-      ctx.fillStyle = config.scaleFontColor;
-      for (var i=0; i<data.labels.length; i++){
-        ctx.save();
-        if (rotateLabels > 0){
-          ctx.translate(yAxisPosX + i*valueHop,xAxisPosY + config.scaleFontSize);
-          ctx.rotate(-(rotateLabels * (Math.PI/180)));
-          ctx.fillText(data.labels[i], 0,0);
-          ctx.restore();
-        }
-
-        else{
-          ctx.fillText(data.labels[i], yAxisPosX + i*valueHop + valueHop/2,xAxisPosY + config.scaleFontSize+3);
+    },
+    removeData: function(atIndex){
+      var indexToDelete = (helpers.isNumber(atIndex)) ? atIndex : this.segments.length-1;
+      this.segments.splice(indexToDelete, 1);
+      this.reflow();
+      this.update();
+    },
+    calculateTotal: function(data){
+      this.total = 0;
+      helpers.each(data,function(segment){
+        this.total += segment.value;
+      },this);
+      this.scale.valuesCount = this.segments.length;
+    },
+    updateScaleRange: function(datapoints){
+      var valuesArray = [];
+      helpers.each(datapoints,function(segment){
+        valuesArray.push(segment.value);
+      });
+
+      var scaleSizes = (this.options.scaleOverride) ?
+        {
+          steps: this.options.scaleSteps,
+          stepValue: this.options.scaleStepWidth,
+          min: this.options.scaleStartValue,
+          max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+        } :
+        helpers.calculateScaleRange(
+          valuesArray,
+          helpers.min([this.chart.width, this.chart.height])/2,
+          this.options.scaleFontSize,
+          this.options.scaleBeginAtZero,
+          this.options.scaleIntegersOnly
+        );
+
+      helpers.extend(
+        this.scale,
+        scaleSizes,
+        {
+          size: helpers.min([this.chart.width, this.chart.height]),
+          xCenter: this.chart.width/2,
+          yCenter: this.chart.height/2
         }
+      );
 
-        ctx.beginPath();
-        ctx.moveTo(yAxisPosX + (i+1) * valueHop, xAxisPosY+3);
-
-        //Check i isnt 0, so we dont go over the Y axis twice.
-          ctx.lineWidth = config.scaleGridLineWidth;
-          ctx.strokeStyle = config.scaleGridLineColor;
-          ctx.lineTo(yAxisPosX + (i+1) * valueHop, 5);
-        ctx.stroke();
-      }
+    },
+    update : function(){
+      this.calculateTotal(this.segments);
 
-      //Y axis
-      ctx.lineWidth = config.scaleLineWidth;
-      ctx.strokeStyle = config.scaleLineColor;
-      ctx.beginPath();
-      ctx.moveTo(yAxisPosX,xAxisPosY+5);
-      ctx.lineTo(yAxisPosX,5);
-      ctx.stroke();
+      helpers.each(this.segments,function(segment){
+        segment.save();
+      });
+      this.render();
+    },
+    reflow : function(){
+      helpers.extend(this.SegmentArc.prototype,{
+        x : this.chart.width/2,
+        y : this.chart.height/2
+      });
+      this.updateScaleRange(this.segments);
+      this.scale.update();
+
+      helpers.extend(this.scale,{
+        xCenter: this.chart.width/2,
+        yCenter: this.chart.height/2
+      });
+
+      helpers.each(this.segments, function(segment){
+        segment.update({
+          outerRadius : this.scale.calculateCenterOffset(segment.value)
+        });
+      }, this);
 
-      ctx.textAlign = "right";
-      ctx.textBaseline = "middle";
-      for (var j=0; j<calculatedScale.steps; j++){
-        ctx.beginPath();
-        ctx.moveTo(yAxisPosX-3,xAxisPosY - ((j+1) * scaleHop));
-        if (config.scaleShowGridLines){
-          ctx.lineWidth = config.scaleGridLineWidth;
-          ctx.strokeStyle = config.scaleGridLineColor;
-          ctx.lineTo(yAxisPosX + xAxisLength + 5,xAxisPosY - ((j+1) * scaleHop));
-        }
-        else{
-          ctx.lineTo(yAxisPosX-0.5,xAxisPosY - ((j+1) * scaleHop));
+    },
+    draw : function(ease){
+      var easingDecimal = ease || 1;
+      //Clear & draw the canvas
+      this.clear();
+      helpers.each(this.segments,function(segment, index){
+        segment.transition({
+          circumference : this.scale.getCircumference(),
+          outerRadius : this.scale.calculateCenterOffset(segment.value)
+        },easingDecimal);
+
+        segment.endAngle = segment.startAngle + segment.circumference;
+
+        // If we've removed the first segment we need to set the first one to
+        // start at the top.
+        if (index === 0){
+          segment.startAngle = Math.PI * 1.5;
         }
 
-        ctx.stroke();
-        if (config.scaleShowLabels){
-          ctx.fillText(calculatedScale.labels[j],yAxisPosX-8,xAxisPosY - ((j+1) * scaleHop));
+        //Check to see if it's the last segment, if not get the next and update the start angle
+        if (index < this.segments.length - 1){
+          this.segments[index+1].startAngle = segment.endAngle;
         }
-      }
+        segment.draw();
+      }, this);
+      this.scale.draw();
+    }
+  });
 
+}).call(this);
+(function(){
+  "use strict";
 
-    }
-    function calculateXAxisSize(){
-      var longestText = 1;
-      //if we are showing the labels
-      if (config.scaleShowLabels){
-        ctx.font = config.scaleFontStyle + " " + config.scaleFontSize+"px " + config.scaleFontFamily;
-        for (var i=0; i<calculatedScale.labels.length; i++){
-          var measuredText = ctx.measureText(calculatedScale.labels[i]).width;
-          longestText = (measuredText > longestText)? measuredText : longestText;
-        }
-        //Add a little extra padding from the y axis
-        longestText +=10;
-      }
-      xAxisLength = width - longestText - widestXLabel;
-      valueHop = Math.floor(xAxisLength/(data.labels.length));
+  var root = this,
+    Chart = root.Chart,
+    helpers = Chart.helpers;
 
-      barWidth = (valueHop - config.scaleGridLineWidth*2 - (config.barValueSpacing*2) - (config.barDatasetSpacing*data.datasets.length-1) - ((config.barStrokeWidth/2)*data.datasets.length-1))/data.datasets.length;
 
-      yAxisPosX = width-widestXLabel/2-xAxisLength;
-      xAxisPosY = scaleHeight + config.scaleFontSize/2;
-    }
-    function calculateDrawingSizes(){
-      maxSize = height;
-
-      //Need to check the X axis first - measure the length of each text metric, and figure out if we need to rotate by 45 degrees.
-      ctx.font = config.scaleFontStyle + " " + config.scaleFontSize+"px " + config.scaleFontFamily;
-      widestXLabel = 1;
-      for (var i=0; i<data.labels.length; i++){
-        var textLength = ctx.measureText(data.labels[i]).width;
-        //If the text length is longer - make that equal to longest text!
-        widestXLabel = (textLength > widestXLabel)? textLength : widestXLabel;
-      }
-      if (width/data.labels.length < widestXLabel){
-        rotateLabels = 45;
-        if (width/data.labels.length < Math.cos(rotateLabels) * widestXLabel){
-          rotateLabels = 90;
-          maxSize -= widestXLabel;
-        }
-        else{
-          maxSize -= Math.sin(rotateLabels) * widestXLabel;
-        }
-      }
-      else{
-        maxSize -= config.scaleFontSize;
-      }
 
-      //Add a little padding between the x line and the text
-      maxSize -= 5;
+  Chart.Type.extend({
+    name: "Radar",
+    defaults:{
+      //Boolean - Whether to show lines for each scale point
+      scaleShowLine : true,
 
+      //Boolean - Whether we show the angle lines out of the radar
+      angleShowLineOut : true,
 
-      labelHeight = config.scaleFontSize;
+      //Boolean - Whether to show labels on the scale
+      scaleShowLabels : false,
 
-      maxSize -= labelHeight;
-      //Set 5 pixels greater than the font size to allow for a little padding from the X axis.
+      // Boolean - Whether the scale should begin at zero
+      scaleBeginAtZero : true,
 
-      scaleHeight = maxSize;
+      //String - Colour of the angle line
+      angleLineColor : "rgba(0,0,0,.1)",
 
-      //Then get the area above we can safely draw on.
+      //Number - Pixel width of the angle line
+      angleLineWidth : 1,
 
-    }
-    function getValueBounds() {
-      var upperValue = Number.MIN_VALUE;
-      var lowerValue = Number.MAX_VALUE;
-      for (var i=0; i<data.datasets.length; i++){
-        for (var j=0; j<data.datasets[i].data.length; j++){
-          if ( data.datasets[i].data[j] > upperValue) { upperValue = data.datasets[i].data[j] };
-          if ( data.datasets[i].data[j] < lowerValue) { lowerValue = data.datasets[i].data[j] };
-        }
-      };
+      //String - Point label font declaration
+      pointLabelFontFamily : "'Gotham', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
 
-      var maxSteps = Math.floor((scaleHeight / (labelHeight*0.66)));
-      var minSteps = Math.floor((scaleHeight / labelHeight*0.5));
+      //String - Point label font weight
+      pointLabelFontStyle : "normal",
 
-      return {
-        maxValue : upperValue,
-        minValue : lowerValue,
-        maxSteps : maxSteps,
-        minSteps : minSteps
-      };
+      //Number - Point label font size in pixels
+      pointLabelFontSize : 11,
 
+      //String - Point label font colour
+      pointLabelFontColor : "rgba(158,171,179,1)",
 
-    }
-  }
+      //Boolean - Whether to show a dot for each point
+      pointDot : true,
 
-  function calculateOffset(val,calculatedScale,scaleHop){
-    var outerValue = calculatedScale.steps * calculatedScale.stepValue;
-    var adjustedValue = val - calculatedScale.graphMin;
-    var scalingFactor = CapValue(adjustedValue/outerValue,1,0);
-    return (scaleHop*calculatedScale.steps) * scalingFactor;
-  }
+      //Number - Radius of each point dot in pixels
+      pointDotRadius : 3,
+
+      //Number - Pixel width of point dot stroke
+      pointDotStrokeWidth : 1,
+
+      //Number - amount extra to add to the radius to cater for hit detection outside the drawn point
+      pointHitDetectionRadius : 20,
 
-  function animationLoop(config,drawScale,drawData,ctx){
-    var animFrameAmount = (config.animation)? 1/CapValue(config.animationSteps,Number.MAX_VALUE,1) : 1,
-      easingFunction = animationOptions[config.animationEasing],
-      percentAnimComplete =(config.animation)? 0 : 1;
+      //Boolean - Whether to show a stroke for datasets
+      datasetStroke : true,
 
+      //Number - Pixel width of dataset stroke
+      datasetStrokeWidth : 1,
 
+      //Boolean - Whether to fill the dataset with a colour
+      datasetFill : true,
 
-    if (typeof drawScale !== "function") drawScale = function(){};
+      //String - A legend template
+      legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].strokeColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
 
-    requestAnimFrame(animLoop);
+    },
 
-    function animateFrame(){
-      var easeAdjustedAnimationPercent =(config.animation)? CapValue(easingFunction(percentAnimComplete),null,0) : 1;
-      clear(ctx);
-      if(config.scaleOverlay){
-        drawData(easeAdjustedAnimationPercent);
-        drawScale();
-      } else {
-        drawScale();
-        drawData(easeAdjustedAnimationPercent);
+    initialize: function(data){
+      this.PointClass = Chart.Point.extend({
+        strokeWidth : this.options.pointDotStrokeWidth,
+        radius : this.options.pointDotRadius,
+        hitDetectionRadius : this.options.pointHitDetectionRadius,
+        ctx : this.chart.ctx
+      });
+
+      this.datasets = [];
+
+      this.buildScale(data);
+
+      //Set up tooltip events on the chart
+      if (this.options.showTooltips){
+        helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+          var activePointsCollection = (evt.type !== 'mouseout') ? this.getPointsAtEvent(evt) : [];
+
+          this.eachPoints(function(point){
+            point.restore(['fillColor', 'strokeColor']);
+          });
+          helpers.each(activePointsCollection, function(activePoint){
+            activePoint.fillColor = activePoint.highlightFill;
+            activePoint.strokeColor = activePoint.highlightStroke;
+          });
+
+          this.showTooltip(activePointsCollection);
+        });
       }
-    }
-    function animLoop(){
-      //We need to check if the animation is incomplete (less than 1), or complete (1).
-        percentAnimComplete += animFrameAmount;
-        animateFrame();
-        //Stop the loop continuing forever
-        if (percentAnimComplete <= 1){
-          requestAnimFrame(animLoop);
-        }
-        else{
-          if (typeof config.onAnimationComplete == "function") config.onAnimationComplete();
-        }
 
-    }
+      //Iterate through each of the datasets, and build this into a property of the chart
+      helpers.each(data.datasets,function(dataset){
+
+        var datasetObject = {
+          label: dataset.label || null,
+          fillColor : dataset.fillColor,
+          strokeColor : dataset.strokeColor,
+          pointColor : dataset.pointColor,
+          pointStrokeColor : dataset.pointStrokeColor,
+          points : []
+        };
+
+        this.datasets.push(datasetObject);
+
+        helpers.each(dataset.data,function(dataPoint,index){
+          //Best way to do this? or in draw sequence...?
+          if (helpers.isNumber(dataPoint)){
+          //Add a new point for each piece of data, passing any required data to draw.
+            var pointPosition;
+            if (!this.scale.animation){
+              pointPosition = this.scale.getPointPosition(index, this.scale.calculateCenterOffset(dataPoint));
+            }
+            datasetObject.points.push(new this.PointClass({
+              value : dataPoint,
+              label : data.labels[index],
+              x: (this.options.animation) ? this.scale.xCenter : pointPosition.x,
+              y: (this.options.animation) ? this.scale.yCenter : pointPosition.y,
+              strokeColor : dataset.pointStrokeColor,
+              fillColor : dataset.pointColor,
+              highlightFill : dataset.pointHighlightFill || dataset.pointColor,
+              highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
+            }));
+          }
+        },this);
 
-  }
+      },this);
 
-  //Declare global functions to be called within this namespace here.
+      this.render();
+    },
+    eachPoints : function(callback){
+      helpers.each(this.datasets,function(dataset){
+        helpers.each(dataset.points,callback,this);
+      },this);
+    },
 
+    getPointsAtEvent : function(evt){
+      var mousePosition = helpers.getRelativePosition(evt),
+        fromCenter = helpers.getAngleFromPoint({
+          x: this.scale.xCenter,
+          y: this.scale.yCenter
+        }, mousePosition);
 
-  // shim layer with setTimeout fallback
-  var requestAnimFrame = (function(){
-    return window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.oRequestAnimationFrame ||
-      window.msRequestAnimationFrame ||
-      function(callback) {
-        window.setTimeout(callback, 1000 / 60);
-      };
-  })();
-
-  function calculateScale(drawingHeight,maxSteps,minSteps,maxValue,minValue,labelTemplateString){
-    var graphMin,graphMax,graphRange,stepValue,numberOfSteps,valueRange,rangeOrderOfMagnitude,decimalNum;
-    valueRange = maxValue - minValue;
-    rangeOrderOfMagnitude = calculateOrderOfMagnitude(valueRange);
-    graphMin = Math.floor(minValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude);
-    graphMax = Math.ceil(maxValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude);
-    graphRange = graphMax - graphMin;
-    stepValue = Math.pow(10, rangeOrderOfMagnitude);
-    numberOfSteps = Math.round(graphRange / stepValue);
-
-    //Compare number of steps to the max and min for that size graph, and add in half steps if need be.
-    while(numberOfSteps < minSteps || numberOfSteps > maxSteps) {
-      if (numberOfSteps < minSteps){
-        stepValue /= 2;
-        numberOfSteps = Math.round(graphRange/stepValue);
+      var anglePerIndex = (Math.PI * 2) /this.scale.valuesCount,
+        pointIndex = Math.round((fromCenter.angle - Math.PI * 1.5) / anglePerIndex),
+        activePointsCollection = [];
+
+      // If we're at the top, make the pointIndex 0 to get the first of the array.
+      if (pointIndex >= this.scale.valuesCount || pointIndex < 0){
+        pointIndex = 0;
       }
-      else{
-        stepValue *=2;
-        numberOfSteps = Math.round(graphRange/stepValue);
+
+      if (fromCenter.distance <= this.scale.drawingArea){
+        helpers.each(this.datasets, function(dataset){
+          activePointsCollection.push(dataset.points[pointIndex]);
+        });
       }
-    }
 
-    var labels = [];
-    populateLabels(labelTemplateString, labels, numberOfSteps, graphMin, stepValue);
+      return activePointsCollection;
+    },
 
-    return {
-      steps : numberOfSteps,
-      stepValue : stepValue,
-      graphMin : graphMin,
-      labels : labels
-    }
+    buildScale : function(data){
+      this.scale = new Chart.RadialScale({
+        display: this.options.showScale,
+        fontStyle: this.options.scaleFontStyle,
+        fontSize: this.options.scaleFontSize,
+        fontFamily: this.options.scaleFontFamily,
+        fontColor: this.options.scaleFontColor,
+        showLabels: this.options.scaleShowLabels,
+        showLabelBackdrop: this.options.scaleShowLabelBackdrop,
+        backdropColor: this.options.scaleBackdropColor,
+        backdropPaddingY : this.options.scaleBackdropPaddingY,
+        backdropPaddingX: this.options.scaleBackdropPaddingX,
+        lineWidth: (this.options.scaleShowLine) ? this.options.scaleLineWidth : 0,
+        lineColor: this.options.scaleLineColor,
+        angleLineColor : this.options.angleLineColor,
+        angleLineWidth : (this.options.angleShowLineOut) ? this.options.angleLineWidth : 0,
+        // Point labels at the edge of each line
+        pointLabelFontColor : this.options.pointLabelFontColor,
+        pointLabelFontSize : this.options.pointLabelFontSize,
+        pointLabelFontFamily : this.options.pointLabelFontFamily,
+        pointLabelFontStyle : this.options.pointLabelFontStyle,
+        height : this.chart.height,
+        width: this.chart.width,
+        xCenter: this.chart.width/2,
+        yCenter: this.chart.height/2,
+        ctx : this.chart.ctx,
+        templateString: this.options.scaleLabel,
+        labels: data.labels,
+        valuesCount: data.datasets[0].data.length
+      });
+
+      this.scale.setScaleSize();
+      this.updateScaleRange(data.datasets);
+      this.scale.buildYLabels();
+    },
+    updateScaleRange: function(datasets){
+      var valuesArray = (function(){
+        var totalDataArray = [];
+        helpers.each(datasets,function(dataset){
+          if (dataset.data){
+            totalDataArray = totalDataArray.concat(dataset.data);
+          }
+          else {
+            helpers.each(dataset.points, function(point){
+              totalDataArray.push(point.value);
+            });
+          }
+        });
+        return totalDataArray;
+      })();
+
+
+      var scaleSizes = (this.options.scaleOverride) ?
+        {
+          steps: this.options.scaleSteps,
+          stepValue: this.options.scaleStepWidth,
+          min: this.options.scaleStartValue,
+          max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+        } :
+        helpers.calculateScaleRange(
+          valuesArray,
+          helpers.min([this.chart.width, this.chart.height])/2,
+          this.options.scaleFontSize,
+          this.options.scaleBeginAtZero,
+          this.options.scaleIntegersOnly
+        );
+
+      helpers.extend(
+        this.scale,
+        scaleSizes
+      );
 
-    function calculateOrderOfMagnitude(val){
-      return Math.floor(Math.log(val) / Math.LN10);
-    }
-  }
+    },
+    addData : function(valuesArray,label){
+      //Map the values array for each of the datasets
+      this.scale.valuesCount++;
+      helpers.each(valuesArray,function(value,datasetIndex){
+          if (helpers.isNumber(value)){
+            var pointPosition = this.scale.getPointPosition(this.scale.valuesCount, this.scale.calculateCenterOffset(value));
+            this.datasets[datasetIndex].points.push(new this.PointClass({
+              value : value,
+              label : label,
+              x: pointPosition.x,
+              y: pointPosition.y,
+              strokeColor : this.datasets[datasetIndex].pointStrokeColor,
+              fillColor : this.datasets[datasetIndex].pointColor
+            }));
+          }
+      },this);
 
-  //Populate an array of all the labels by interpolating the string.
-  function populateLabels(labelTemplateString, labels, numberOfSteps, graphMin, stepValue) {
-    if (labelTemplateString) {
-      //Fix floating point errors by setting to fixed the on the same decimal as the stepValue.
-      for (var i = 1; i < numberOfSteps + 1; i++) {
-        labels.push(tmpl(labelTemplateString, {value: (graphMin + (stepValue * i)).toFixed(getDecimalPlaces(stepValue))}));
-      }
-    }
-  }
-  // Cycle a given array of colours (for multi coloured bars in bargraphs)
-  function cycleColor(colors, i) {
-             return (colors && colors.constructor.name == "Array") ? colors[i % colors.length] : colors;
-        }
-  //Max value from array
-  function Max( array ){
-    return Math.max.apply( Math, array );
-  };
-  //Min value from array
-  function Min( array ){
-    return Math.min.apply( Math, array );
-  };
-  //Default if undefined
-  function Default(userDeclared,valueIfFalse){
-    if(!userDeclared){
-      return valueIfFalse;
-    } else {
-      return userDeclared;
-    }
-  };
-  //Is a number function
-  function isNumber(n) {
-    return !isNaN(parseFloat(n)) && isFinite(n);
-  }
-  //Apply cap a value at a high or low number
-  function CapValue(valueToCap, maxValue, minValue){
-    if(isNumber(maxValue)) {
-      if( valueToCap > maxValue ) {
-        return maxValue;
-      }
-    }
-    if(isNumber(minValue)){
-      if ( valueToCap < minValue ){
-        return minValue;
-      }
-    }
-    return valueToCap;
-  }
-  function getDecimalPlaces (num){
-    var numberOfDecimalPlaces;
-    if (num%1!=0){
-      return num.toString().split(".")[1].length
-    }
-    else{
-      return 0;
-    }
+      this.scale.labels.push(label);
 
-  }
+      this.reflow();
+
+      this.update();
+    },
+    removeData : function(){
+      this.scale.valuesCount--;
+      this.scale.labels.shift();
+      helpers.each(this.datasets,function(dataset){
+        dataset.points.shift();
+      },this);
+      this.reflow();
+      this.update();
+    },
+    update : function(){
+      this.eachPoints(function(point){
+        point.save();
+      });
+      this.render();
+    },
+    reflow: function(){
+      helpers.extend(this.scale, {
+        width : this.chart.width,
+        height: this.chart.height,
+        size : helpers.min([this.chart.width, this.chart.height]),
+        xCenter: this.chart.width/2,
+        yCenter: this.chart.height/2
+      });
+      this.updateScaleRange(this.datasets);
+      this.scale.setScaleSize();
+      this.scale.buildYLabels();
+    },
+    draw : function(ease){
+      var easeDecimal = ease || 1,
+        ctx = this.chart.ctx;
+      this.clear();
+      this.scale.draw();
+
+      helpers.each(this.datasets,function(dataset){
+
+        //Transition each point first so that the line and point drawing isn't out of sync
+        helpers.each(dataset.points,function(point,index){
+          point.transition(this.scale.getPointPosition(index, this.scale.calculateCenterOffset(point.value)), easeDecimal);
+        },this);
+
+
+
+        //Draw the line between all the points
+        ctx.lineWidth = this.options.datasetStrokeWidth;
+        ctx.strokeStyle = dataset.strokeColor;
+        ctx.beginPath();
+        helpers.each(dataset.points,function(point,index){
+          if (index === 0){
+            ctx.moveTo(point.x,point.y);
+          }
+          else{
+            ctx.lineTo(point.x,point.y);
+          }
+        },this);
+        ctx.closePath();
+        ctx.stroke();
+
+        ctx.fillStyle = dataset.fillColor;
+        ctx.fill();
+
+        //Now draw the points over the line
+        //A little inefficient double looping, but better than the line
+        //lagging behind the point positions
+        helpers.each(dataset.points,function(point){
+          point.draw();
+        });
+
+      },this);
 
-  function mergeChartConfig(defaults,userDefined){
-    var returnObj = {};
-    for (var attrname in defaults) { returnObj[attrname] = defaults[attrname]; }
-    for (var attrname in userDefined) {
-      if(typeof(userDefined[attrname]) === "object" && defaults[attrname]) {
-        returnObj[attrname] = mergeChartConfig(defaults[attrname], userDefined[attrname]);
-      } else {
-        returnObj[attrname] = userDefined[attrname];
-      }
     }
-    return returnObj;
-  }
 
-  //Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
-    var cache = {};
-
-    function tmpl(str, data){
-    // Figure out if we're getting a template, or if we need to
-    // load the template - and be sure to cache the result.
-    var fn = !/\W/.test(str) ?
-      cache[str] = cache[str] ||
-      tmpl(document.getElementById(str).innerHTML) :
-
-      // Generate a reusable function that will serve as a template
-      // generator (and which will be cached).
-      new Function("obj",
-      "var p=[],print=function(){p.push.apply(p,arguments);};" +
-
-      // Introduce the data as local variables using with(){}
-      "with(obj){p.push('" +
-
-      // Convert the template into pure JavaScript
-      str
-        .replace(/[\r\t\n]/g, " ")
-        .split("<%").join("\t")
-        .replace(/((^|%>)[^\t]*)'/g, "$1\r")
-        .replace(/\t=(.*?)%>/g, "',$1,'")
-        .split("\t").join("');")
-        .split("%>").join("p.push('")
-        .split("\r").join("\\'")
-      + "');}return p.join('');");
-
-    // Provide some basic currying to the user
-    return data ? fn( data ) : fn;
-    };
+  });
 
-  function getFadeColor(percent, primColor, secColor) {
-    var pseudoEl = document.createElement('div'),
-      rgbPrim,
-      rgbSec;
-    pseudoEl.style.color = primColor;
-    document.body.appendChild(pseudoEl);
-    rgbPrim = window.getComputedStyle(pseudoEl).color;
-    pseudoEl.style.color = secColor;
-    rgbSec = window.getComputedStyle(pseudoEl).color;
-    var regex = /rgb *\( *([0-9]{1,3}) *, *([0-9]{1,3}) *, *([0-9]{1,3}) *\)/,
-      valuesP = regex.exec(rgbPrim),
-      valuesS = regex.exec(rgbSec),
-      rP = Math.round(parseFloat(valuesP[1])),
-      gP = Math.round(parseFloat(valuesP[2])),
-      bP = Math.round(parseFloat(valuesP[3])),
-      rS = Math.round(parseFloat(valuesS[1])),
-      gS = Math.round(parseFloat(valuesS[2])),
-      bS = Math.round(parseFloat(valuesS[3])),
-      rCur = parseInt((rP-rS)*percent+rS),
-      gCur = parseInt((gP-gS)*percent+gS),
-      bCur = parseInt((bP-bS)*percent+bS);
-    pseudoEl.parentNode.removeChild(pseudoEl);
-    return "rgb("+rCur+','+gCur+','+bCur+')';
-  }
-}
+}).call(this);