From 470a5f3821f8b1e4393b46cfe65c9c17aeff5470 Mon Sep 17 00:00:00 2001
From: dsc <david.schoonover@gmail.com>
Date: Tue, 2 Nov 2010 05:35:57 -0700
Subject: [PATCH] Adds FPS sparkline.

---
 bin/deploy.sh                |   34 ++
 css/lttl.css                 |    3 +-
 index.php                    |    6 +
 lib/jquery.sparkline.js      | 1050 ++++++++++++++++++++++++++++++++++++++++++
 lib/jquery.sparkline.min.js  |   85 ++++
 src/Y/core.js                |    4 +-
 src/Y/modules/y.event.js     |   77 ++--
 src/Y/y-function.js          |   41 +-
 src/evt/evt.class.js         |  202 ++++++++
 src/evt/evt.js.php           |   40 ++
 src/portal/util/eventloop.js |   34 +-
 src/portal/util/fps.js       |   99 ++++
 src/tanks/bullet/bullet.js   |    5 +
 src/tanks/game/map.js        |    4 +-
 src/tanks/game/player.js     |   16 +-
 src/tanks/ui.js              |   27 +-
 src/tanks/unit/tank.js       |  102 +----
 src/tanks/unit/thing.js      |  127 +++++
 18 files changed, 1768 insertions(+), 188 deletions(-)
 create mode 100755 bin/deploy.sh
 create mode 100644 lib/jquery.sparkline.js
 create mode 100644 lib/jquery.sparkline.min.js
 create mode 100644 src/evt/evt.class.js
 create mode 100644 src/evt/evt.js.php
 create mode 100644 src/portal/util/fps.js
 create mode 100644 src/tanks/bullet/bullet.js
 create mode 100644 src/tanks/unit/thing.js

diff --git a/bin/deploy.sh b/bin/deploy.sh
new file mode 100755
index 0000000..4a6a94f
--- /dev/null
+++ b/bin/deploy.sh
@@ -0,0 +1,34 @@
+#! /bin/bash
+
+function halp () {
+    cat >&2 <<-HALP
+The Littlest Deployer of Battletanks
+
+Usage:     $( basename $0 ) [options] 
+
+Deploys Simoon files.
+
+Options:
+    -h              Displays this help.
+HALP
+}
+
+SHIFT=0
+function incshift () { SHIFT=$(( $SHIFT + ${1:-1} )); }
+function join () { seps="$IFS"; IFS="$1"; shift; echo "$*"; IFS="$seps"; }
+function fail () { echo "PREDICTABLE FAILURE. $1" >&2; exit 1; }
+
+for opt in $*; do
+    egrep -xq -e '--?h(e(lp?)?)?' && { halp; exit 0; }
+done
+# while getopts "b:" opt; do
+#     case $opt in
+#         b ) B=$OPTARG; incshift 2 ;;
+#     esac
+# done
+# shift $SHIFT
+
+rsync -Cavz --delete --exclude=tmp ./* less.ly:lessly/hacking/tanks/
+
+
+
diff --git a/css/lttl.css b/css/lttl.css
index 1d2321e..0bd2596 100644
--- a/css/lttl.css
+++ b/css/lttl.css
@@ -12,7 +12,8 @@ ul, ol, li { list-style: none ! important; margin:0; padding:0; }
 #howto { position:fixed; top:3em; right:1em; color:#BFBFBF; }
 
 #info { position:fixed; bottom:10px; right:10px; padding:0.5em; background-color:rgba(0,0,0, 0.1); color:#787878; }
+    #info #state { font-weight:bold; }
     #info label { display:block; float:left; width:3em; margin-right:0.5em; color:#787878; }
     #info input { border:0; background-color:transparent; min-width:5em; width:5em; color:#5c5c5c; }
     #info .sep { opacity:0.1; background-color:#999; margin:5px 0; height:1px; }
-
+    #info .fps-sparkline { width:100%; height:1.5em; margin-top:0.5em; }
diff --git a/index.php b/index.php
index 04f9df7..e2b5d7a 100644
--- a/index.php
+++ b/index.php
@@ -14,6 +14,7 @@
 
 <ul id="info" class="rounded">
     <li id="state"></li>
+    <li><div class="fps-sparkline"></div></li>
     <li><label for="fps">fps</label> <input id="fps" name="fps" value="" type="text"></li>
     <li><label for="frame">frame</label> <input id="frame" name="frame" value="" type="text"></li>
     <li><div class="sep"></div></li>
@@ -27,6 +28,7 @@
 <?php
 $scripts = array(
     "lib/jquery-1.4.3.js",
+    "lib/jquery.sparkline.min.js",
     "lib/jquery.hotkeys.js",
     
     // "http://static.ukijs.org/pkg/0.3.8/uki.js",
@@ -37,11 +39,14 @@ $scripts = array(
     "src/Y/y.js.php",
     "src/Y/modules/y.event.js",
     
+    "src/evt/evt.class.js",
+    
     "src/portal/layer.js",
     "src/portal/shape.js",
     "src/portal/util/quadtree.js",
     "src/portal/util/rbtree.js",
     "src/portal/util/eventloop.js",
+    "src/portal/util/fps.js",
     "src/portal/util/cooldown.js",
     "src/portal/util/loc.js",
     
@@ -51,6 +56,7 @@ $scripts = array(
     "src/tanks/game/game.js",
     "src/tanks/game/map.js",
     
+    "src/tanks/unit/thing.js",
     "src/tanks/unit/tank.js",
     
     "src/tanks/game/player.js",
diff --git a/lib/jquery.sparkline.js b/lib/jquery.sparkline.js
new file mode 100644
index 0000000..1c35b5f
--- /dev/null
+++ b/lib/jquery.sparkline.js
@@ -0,0 +1,1050 @@
+/**
+*
+* jquery.sparkline.js
+*
+* v1.5.1
+* (c) Splunk, Inc 
+* Contact: Gareth Watts (gareth@splunk.com)
+* http://omnipotent.net/jquery.sparkline/
+*
+* Generates inline sparkline charts from data supplied either to the method
+* or inline in HTML
+* 
+* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
+* (Firefox 2.0+, Safari, Opera, etc)
+*
+* License: New BSD License
+* 
+* Copyright (c) 2010, Splunk Inc.
+* All rights reserved.
+* 
+* Redistribution and use in source and binary forms, with or without modification, 
+* are permitted provided that the following conditions are met:
+* 
+*     * Redistributions of source code must retain the above copyright notice, 
+*       this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright notice, 
+*       this list of conditions and the following disclaimer in the documentation 
+*       and/or other materials provided with the distribution.
+*     * Neither the name of Splunk Inc nor the names of its contributors may 
+*       be used to endorse or promote products derived from this software without 
+*       specific prior written permission.
+* 
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*
+* Usage: 
+*  $(selector).sparkline(values, options)
+*
+* If values is undefined or set to 'html' then the data values are read from the specified tag:
+*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
+*   $('.sparkline').sparkline();
+* There must be no spaces in the enclosed data set
+*
+* Otherwise values must be an array of numbers or null values
+*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
+*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
+*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
+*
+* For line charts, x values can also be specified:
+*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
+*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
+*
+* Supported options:
+*   lineColor - Color of the line used for the chart
+*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
+*   width - Width of the chart - Defaults to 3 times the number of values in pixels
+*   height - Height of the chart - Defaults to the height of the containing element
+*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
+*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
+*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
+*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
+*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
+*   composite - If true then don't erase any existing chart attached to the tag, but draw
+*           another chart over the top - Note that width and height are ignored if an
+*           existing chart is detected.
+*
+* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
+* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
+*    line - Line chart.  Options:
+*       spotColor - Set to '' to not end each line in a circular spot
+*       minSpotColor - If set, color of spot at minimum value
+*       maxSpotColor - If set, color of spot at maximum value
+*       spotRadius - Radius in pixels
+*       lineWidth - Width of line in pixels
+*       normalRangeMin 
+*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
+*                      or expected range of values
+*       normalRangeColor - Color to use for the above bar
+*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
+*
+*   bar - Bar chart.  Options:
+*       barColor - Color of bars for postive values
+*       negBarColor - Color of bars for negative values
+*       zeroColor - Color of bars with zero values
+*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
+*       barWidth - Width of bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars
+*       barSpacing - Gap between bars in pixels
+*       zeroAxis - Centers the y-axis around zero if true
+*
+*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
+*       posBarColor - Color of win values
+*       negBarColor - Color of lose values
+*       zeroBarColor - Color of draw values
+*       barWidth - Width of bars in pixels
+*       barSpacing - Gap between bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars
+*
+*   discrete - Options:
+*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
+*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
+*       thresholdColor
+*
+*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
+*       options:
+*       targetColor - The color of the vertical target marker
+*       targetWidth - The width of the target marker in pixels
+*       performanceColor - The color of the performance measure horizontal bar
+*       rangeColors - Colors to use for each qualitative range background color
+*
+*   pie - Pie chart. Options:
+*       sliceColors - An array of colors to use for pie slices
+*       offset - Angle in degrees to offset the first slice - Try -90 or +90
+*
+*   box - Box plot. Options:
+*       raw - Set to true to supply pre-computed plot points as values
+*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
+*             When set to false you can supply any number of values and the box plot will
+*             be computed for you.  Default is false.
+*       showOutliers - Set to true (default) to display outliers as circles
+*       outlierIRQ - Interquartile range used to determine outliers.  Default 1.5
+*       boxLineColor - Outline color of the box
+*       boxFillColor - Fill color for the box
+*       whiskerColor - Line color used for whiskers
+*       outlierLineColor - Outline color of outlier circles
+*       outlierFillColor - Fill color of the outlier circles
+*       spotRadius - Radius of outlier circles
+*       medianColor - Line color of the median line
+*       target - Draw a target cross hair at the supplied value (default undefined)
+*      
+*   
+*       
+*   Examples:
+*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
+*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
+*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
+*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
+*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
+*   $('#pie').sparkline([1,1,2], { type:'pie' });
+*/
+
+
+(function($) {
+
+    // Provide a cross-browser interface to a few simple drawing primitives
+    $.fn.simpledraw = function(width, height, use_existing) {
+        if (use_existing && this[0].vcanvas) return this[0].vcanvas;
+        if (width==undefined) width=$(this).innerWidth();
+        if (height==undefined) height=$(this).innerHeight();
+        if ($.browser.hasCanvas) {
+            return new vcanvas_canvas(width, height, this);
+        } else if ($.browser.msie) {
+            return new vcanvas_vml(width, height, this);
+        } else {
+            return false;
+        }
+    };
+
+    var pending = [];
+
+    $.fn.sparkline = function(uservalues, options) {
+        var options = $.extend({
+            type : 'line',
+            lineColor : '#00f',
+            fillColor : '#cdf',
+            defaultPixelsPerValue : 3,
+            width : 'auto', 
+            height : 'auto',
+            composite : false
+        }, options ? options : {});
+        
+        return this.each(function() {
+            var render = function() {
+                var values = (uservalues=='html' || uservalues==undefined) ? $(this).text().split(',') : uservalues;
+
+                var width = options.width=='auto' ? values.length*options.defaultPixelsPerValue : options.width;
+                if (options.height == 'auto') {
+                    if (!options.composite || !this.vcanvas) {
+                        // must be a better way to get the line height
+                        var tmp = document.createElement('span');
+                        tmp.innerHTML = 'a';
+                        $(this).html(tmp);
+                        height = $(tmp).innerHeight();
+                        $(tmp).remove();
+                    }
+                } else {
+                    height = options.height;
+                }
+
+                $.fn.sparkline[options.type].call(this, values, options, width, height);
+            }
+            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
+            if (($(this).html() && $(this).is(':hidden')) || ($.fn.jquery < "1.3.0" && $(this).parents().is(':hidden'))) {
+                pending.push([this, render]);
+            } else {
+                render.call(this);
+            }
+        });
+    };
+
+
+    $.sparkline_display_visible = function() {
+        for (var i=pending.length-1; i>=0; i--) {
+            var el = pending[i][0];
+            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
+                pending[i][1].call(el);
+                pending.splice(i, 1);
+            }
+        }
+    };
+
+    $.fn.sparkline.line = function(values, options, width, height) {
+        var options = $.extend({
+            spotColor : '#f80',
+            spotRadius : 1.5,
+            minSpotColor : '#f80',
+            maxSpotColor : '#f80',
+            lineWidth: 1, 
+            normalRangeMin : undefined,
+            normalRangeMax : undefined,
+            normalRangeColor : '#ccc',
+            chartRangeMin : undefined,
+            chartRangeMax : undefined,
+            chartRangeMinX : undefined,
+            chartRangeMaxX : undefined
+        }, options ? options : {});
+
+        var xvalues = [], yvalues = [], yminmax = [];
+        for (i=0; i<values.length; i++) {
+            var v = values[i];
+            var isstr = typeof(values[i])=='string';
+            var isarray = typeof(values[i])=='object' && values[i] instanceof Array;
+            var sp = isstr && values[i].split(':');
+            if (isstr && sp.length == 2) { // x:y
+                xvalues.push(Number(sp[0]));
+                yvalues.push(Number(sp[1]));
+                yminmax.push(Number(sp[1]));
+            } else if (isarray) {
+                xvalues.push(values[i][0]);
+                yvalues.push(values[i][1]);
+                yminmax.push(values[i][1]);
+            } else {
+                xvalues.push(i);
+                if (values[i]===null || values[i]=='null') {
+                    yvalues.push(null);
+                } else {
+                    yvalues.push(Number(values[i]));
+                    yminmax.push(Number(values[i]));
+                }
+            }
+        }
+        if (options.xvalues) {
+            xvalues = options.xvalues;
+        }
+
+        var maxy = Math.max.apply(Math, yminmax);
+        var maxyval = maxy;
+        var miny = Math.min.apply(Math, yminmax);
+        var minyval = miny;
+
+        var maxx = Math.max.apply(Math, xvalues);
+        var maxxval = maxx;
+        var minx = Math.min.apply(Math, xvalues);
+        var minxval = minx;
+
+        if (options.normalRangeMin!=undefined) {
+            if (options.normalRangeMin<miny)
+                miny = options.normalRangeMin;
+            if (options.normalRangeMax>maxy)
+                maxy = options.normalRangeMax;
+        }
+        if (options.chartRangeMin!=undefined && (options.chartRangeClip ||  options.chartRangeMin<miny)) {
+            miny = options.chartRangeMin;
+        }
+        if (options.chartRangeMax!=undefined && (options.chartRangeClip || options.chartRangeMax>maxy)) {
+            maxy = options.chartRangeMax;
+        }
+        if (options.chartRangeMinX!=undefined && (options.chartRangeClipX || options.chartRangeMinX<minx)) {
+            minx = options.chartRangeMinX;
+        }
+        if (options.chartRangeMaxX!=undefined && (options.chartRangeClipX || options.chartRangeMaxX>maxx)) {
+            maxx = options.chartRangeMaxX;
+        }
+        var rangex = maxx-minx == 0 ? 1 : maxx-minx;
+        var rangey = maxy-miny == 0 ? 1 : maxy-miny;
+        var vl = yvalues.length-1;
+
+        if (vl<1) {
+            this.innerHTML = '';
+            return;
+        }
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+            var canvas_top = 0;
+            var canvas_left = 0;
+
+            if (options.spotRadius && (canvas_width < (options.spotRadius*4) || canvas_height < (options.spotRadius*4))) {
+                options.spotRadius = 0;
+            }
+            if (options.spotRadius) {
+                // adjust the canvas size as required so that spots will fit
+                if (options.minSpotColor || (options.spotColor && yvalues[vl]==miny)) 
+                    canvas_height -= Math.ceil(options.spotRadius);
+                if (options.maxSpotColor || (options.spotColor && yvalues[vl]==maxy)) {
+                    canvas_height -= Math.ceil(options.spotRadius);
+                    canvas_top += Math.ceil(options.spotRadius);
+                }
+                if (options.minSpotColor || options.maxSpotColor && (yvalues[0]==miny || yvalues[0]==maxy)) {
+                    canvas_left += Math.ceil(options.spotRadius);
+                    canvas_width -= Math.ceil(options.spotRadius);
+                }
+                if (options.spotColor || (options.minSpotColor || options.maxSpotColor && (yvalues[vl]==miny||yvalues[vl]==maxy)))
+                    canvas_width -= Math.ceil(options.spotRadius);
+            }
+
+
+            canvas_height--;
+            if (options.normalRangeMin!=undefined) {
+                var ytop = canvas_top+Math.round(canvas_height-(canvas_height*((options.normalRangeMax-miny)/rangey)));
+                var height = Math.round((canvas_height*(options.normalRangeMax-options.normalRangeMin))/rangey);
+                target.drawRect(canvas_left, ytop, canvas_width, height, undefined, options.normalRangeColor);
+            }
+
+            var path = [];
+            var paths = [path];
+            for(var i=0, vlen=yvalues.length; i<vlen; i++) {
+                var x=xvalues[i], y=yvalues[i];
+                if (y===null) {
+                    if (i) {
+                        if (yvalues[i-1]!==null) {
+                            path = [];
+                            paths.push(path);
+                        }
+                    }
+                } else {
+                    if (y < miny) y=miny;
+                    if (y > maxy) y=maxy;
+                    if (!path.length) {
+                        // previous value was null
+                        path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+canvas_height]);
+                    }
+                    path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+Math.round(canvas_height-(canvas_height*((y-miny)/rangey)))]);
+                }
+            }
+            for(var i=0, plen=paths.length; i<plen; i++) {
+                path = paths[i];
+                if (!path.length)
+                    continue; // last value was null
+                if (options.fillColor) {
+                    path.push([path[path.length-1][0], canvas_top+canvas_height-1]);
+                    target.drawShape(path, undefined, options.fillColor);
+                    path.pop();
+                }
+                // if there's only a single point in this path, then we want to display it as a vertical line
+                // which means we keep path[0]  as is
+                if (path.length>2) {
+                    // else we want the first value 
+                    path[0] = [ path[0][0], path[1][1] ];
+                }
+                target.drawShape(path, options.lineColor, undefined, options.lineWidth);
+            }
+            if (options.spotRadius && options.spotColor) {
+                target.drawCircle(canvas_left+Math.round(xvalues[xvalues.length-1]*(canvas_width/rangex)),  canvas_top+Math.round(canvas_height-(canvas_height*((yvalues[vl]-miny)/rangey))), options.spotRadius, undefined, options.spotColor);
+            }
+            if (maxy!=minyval) {
+                if (options.spotRadius && options.minSpotColor) {
+                    var x = xvalues[yvalues.indexOf(minyval)];
+                    target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)),  canvas_top+Math.round(canvas_height-(canvas_height*((minyval-miny)/rangey))), options.spotRadius, undefined, options.minSpotColor);
+                }
+                if (options.spotRadius && options.maxSpotColor) {
+                    var x = xvalues[yvalues.indexOf(maxyval)];
+                    target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)),  canvas_top+Math.round(canvas_height-(canvas_height*((maxyval-miny)/rangey))), options.spotRadius, undefined, options.maxSpotColor);
+                }
+            }
+        } else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+    };
+
+    $.fn.sparkline.bar = function(values, options, width, height) {
+        var options = $.extend({
+            type : 'bar',
+            barColor : '#00f',
+            negBarColor : '#f44',
+            zeroColor: undefined,
+            nullColor: undefined,
+            zeroAxis : undefined,
+            barWidth : 4,
+            barSpacing : 1,
+            chartRangeMax: undefined,
+            chartRangeMin: undefined,
+            chartRangeClip: false,
+            colorMap : undefined
+        }, options ? options : {});
+
+        var width = (values.length * options.barWidth) + ((values.length-1) * options.barSpacing);
+        var num_values = [];
+        for(var i=0, vlen=values.length; i<vlen; i++) {
+            if (values[i]=='null' || values[i]===null) {
+                values[i] = null;
+            } else {
+                values[i] = Number(values[i]);
+                num_values.push(Number(values[i]));
+            }
+        }
+        var max = Math.max.apply(Math, num_values);
+        var min = Math.min.apply(Math, num_values);
+        if (options.chartRangeMin!=undefined && (options.chartRangeClip || options.chartRangeMin<min)) {
+            min = options.chartRangeMin;
+        }
+        if (options.chartRangeMax!=undefined && (options.chartRangeClip || options.chartRangeMax>max)) {
+            max = options.chartRangeMax;
+        }
+        if (options.zeroAxis == undefined) options.zeroAxis = min<0;
+        var range = max-min == 0 ? 1 : max-min;
+
+        if ($.isArray(options.colorMap)) {
+            var colorMapByIndex = options.colorMap;
+            var colorMapByValue = null;
+        } else {
+            var colorMapByIndex = null;
+            var colorMapByValue = options.colorMap;
+        }
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+            var yzero = min<0 && options.zeroAxis ? canvas_height-Math.round(canvas_height * (Math.abs(min)/range))-1 : canvas_height-1;
+
+            for(var i=0, vlen=values.length; i<vlen; i++) {
+                var x = i*(options.barWidth+options.barSpacing);
+                var val = values[i];
+                if (val===null) {
+                    if (options.nullColor) {
+                        color = options.nullColor;
+                        val = (options.zeroAxis && min<0) ? 0 : min;
+                        var height = 1;
+                        var y = (options.zeroAxis && min<0) ? yzero : canvas_height - height;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    if (val < min) val=min;
+                    if (val > max) val=max;
+                    var color = (val < 0) ? options.negBarColor : options.barColor;
+                    if (options.zeroAxis && min<0) {
+                        var height = Math.round(canvas_height*((Math.abs(val)/range)))+1;
+                        var y = (val < 0) ? yzero : yzero-height;
+                    } else {
+                        var height = Math.round(canvas_height*((val-min)/range))+1;
+                        var y = canvas_height-height;
+                    }
+                    if (val==0 && options.zeroColor!=undefined) {
+                        color = options.zeroColor;
+                    }
+                    if (colorMapByValue && colorMapByValue[val]) {
+                        color = colorMapByValue[val];
+                    } else if (colorMapByIndex && colorMapByIndex.length>i) {
+                        color = colorMapByIndex[i];
+                    }
+                    if (color===null) {
+                        continue;
+                    }
+                }
+                target.drawRect(x, y, options.barWidth-1, height-1, color, color);
+            }
+        } else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+    };
+
+    $.fn.sparkline.tristate = function(values, options, width, height) {
+        values = $.map(values, Number);
+        var options = $.extend({
+            barWidth : 4,
+            barSpacing : 1,
+            posBarColor: '#6f6',
+            negBarColor : '#f44',
+            zeroBarColor : '#999',
+            colorMap : {}
+        }, options);
+
+        var width = (values.length * options.barWidth) + ((values.length-1) * options.barSpacing);
+
+        if ($.isArray(options.colorMap)) {
+            var colorMapByIndex = options.colorMap;
+            var colorMapByValue = null;
+        } else {
+            var colorMapByIndex = null;
+            var colorMapByValue = options.colorMap;
+        }
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+            var half_height = Math.round(canvas_height/2);
+
+            for(var i=0, vlen=values.length; i<vlen; i++) {
+                var x = i*(options.barWidth+options.barSpacing);
+                if (values[i] < 0) {
+                    var y = half_height;
+                    var height = half_height-1;
+                    var color = options.negBarColor;
+                } else if (values[i] > 0) {
+                    var y = 0;
+                    var height = half_height-1;
+                    var color = options.posBarColor;
+                } else {
+                    var y = half_height-1;
+                    var height = 2;
+                    var color = options.zeroBarColor;
+                }
+                if (colorMapByValue && colorMapByValue[values[i]]) {
+                    color = colorMapByValue[values[i]];
+                } else if (colorMapByIndex && colorMapByIndex.length>i) {
+                    color = colorMapByIndex[i];
+                }
+                if (color===null) {
+                    continue;
+                }
+                target.drawRect(x, y, options.barWidth-1, height-1, color, color);
+            }
+        } else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+    };
+
+    $.fn.sparkline.discrete = function(values, options, width, height) {
+        values = $.map(values, Number);
+        var options = $.extend({
+            lineHeight: 'auto',
+            thresholdColor: undefined,
+            thresholdValue : 0,
+            chartRangeMax: undefined,
+            chartRangeMin: undefined,
+            chartRangeClip: false
+        }, options);
+
+        width = options.width=='auto' ? values.length*2 : width;
+        var interval = Math.floor(width / values.length);
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+            var line_height = options.lineHeight == 'auto' ? Math.round(canvas_height * 0.3) : options.lineHeight;
+            var pheight = canvas_height - line_height;
+            var min = Math.min.apply(Math, values);
+            var max = Math.max.apply(Math, values);
+            if (options.chartRangeMin!=undefined && (options.chartRangeClip || options.chartRangeMin<min)) {
+                min = options.chartRangeMin;
+            }
+            if (options.chartRangeMax!=undefined && (options.chartRangeClip  || options.chartRangeMax>max)) {
+                max = options.chartRangeMax;
+            }
+            var range = max-min;
+
+            for(var i=0, vlen=values.length; i<vlen; i++) {
+                var val = values[i];
+                if (val < min) val=min;
+                if (val > max) val=max;
+                var x = (i*interval);
+                var ytop = Math.round(pheight-pheight*((val-min)/range));
+                target.drawLine(x, ytop, x, ytop+line_height, (options.thresholdColor && val < options.thresholdValue) ? options.thresholdColor : options.lineColor);
+            }
+        }  else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+                
+    };
+
+    $.fn.sparkline.bullet = function(values, options, width, height) {
+        values = $.map(values, Number);
+        // target, performance, range1, range2, range3
+        var options = $.extend({
+            targetColor : 'red',
+            targetWidth : 3, // width of the target bar in pixels
+            performanceColor : 'blue',
+            rangeColors : ['#D3DAFE', '#A8B6FF', '#7F94FF' ],
+            base : undefined // set this to a number to change the base start number
+        }, options);
+
+        
+        width = options.width=='auto' ? '4.0em' : width;
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target && values.length>1) {
+            var canvas_width = target.pixel_width-Math.ceil(options.targetWidth/2);
+            var canvas_height = target.pixel_height;
+
+            var min = Math.min.apply(Math, values);
+            var max = Math.max.apply(Math, values);
+            if (options.base == undefined) {
+                var min = min < 0 ? min : 0;
+            } else {
+                min = options.base;
+            }
+            var range = max-min;
+
+            // draw range values
+            for(i=2, vlen=values.length; i<vlen; i++) {
+                var rangeval = parseInt(values[i]);
+                var rangewidth = Math.round(canvas_width*((rangeval-min)/range));
+                target.drawRect(0, 0, rangewidth-1, canvas_height-1, options.rangeColors[i-2], options.rangeColors[i-2]);
+            }
+
+            // draw the performance bar
+            var perfval = parseInt(values[1]);
+            var perfwidth = Math.round(canvas_width*((perfval-min)/range));
+            target.drawRect(0, Math.round(canvas_height*0.3), perfwidth-1, Math.round(canvas_height*0.4)-1, options.performanceColor, options.performanceColor);
+
+            // draw the target linej
+            var targetval = parseInt(values[0]);
+            var x = Math.round(canvas_width*((targetval-min)/range)-(options.targetWidth/2));
+            var targettop = Math.round(canvas_height*0.10);
+            var targetheight = canvas_height-(targettop*2);
+            target.drawRect(x, targettop, options.targetWidth-1, targetheight-1, options.targetColor, options.targetColor);
+        }  else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+    };
+
+    $.fn.sparkline.pie = function(values, options, width, height) {
+        values = $.map(values, Number);
+        var options = $.extend({
+            sliceColors : ['#f00', '#0f0', '#00f']
+        }, options);
+
+        width = options.width=='auto' ? height : width;
+
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target && values.length>1) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+                
+            var radius = Math.floor(Math.min(canvas_width, canvas_height)/2);
+            var total = 0;
+            for(var i=0, vlen=values.length; i<vlen; i++)
+                total += values[i];
+            var next = 0;
+            if (options.offset) {
+                next += (2*Math.PI)*(options.offset/360);
+            }
+            var circle = 2*Math.PI;
+            for(var i=0, vlen=values.length; i<vlen; i++) {
+                var start = next;
+                var end = next;
+                if (total > 0) {  // avoid divide by zero
+                    end = next + (circle*(values[i]/total));
+                }
+                target.drawPieSlice(radius, radius, radius, start, end, undefined, options.sliceColors[i % options.sliceColors.length]);
+                next = end;
+            }
+        }
+    };
+
+    function quartile(values, q) {
+        if (q==2) {
+            var vl2 = Math.floor(values.length/2);
+            return values.length % 2 ? values[vl2] : (values[vl2]+values[vl2+1])/2;
+        } else {
+            var vl4 = Math.floor(values.length/4);
+            return values.length % 2 ? (values[vl4*q]+values[vl4*q+1])/2 : values[vl4*q];
+        }
+    };
+
+    $.fn.sparkline.box = function(values, options, width, height) {
+        values = $.map(values, Number);
+        var options = $.extend({
+            raw: false,
+            boxLineColor: 'black',
+            boxFillColor: '#cdf',
+            whiskerColor: 'black',
+            outlierLineColor: '#333',
+            outlierFillColor: 'white',
+            medianColor: 'red',
+            showOutliers: true,
+            outlierIQR: 1.5,
+            spotRadius: 1.5,
+            target: undefined,
+            targetColor: '#4a2',
+            chartRangeMax: undefined,
+            chartRangeMin: undefined
+        }, options);
+
+        width = options.width=='auto' ? '4.0em' : width;
+
+        minvalue = options.chartRangeMin==undefined ? Math.min.apply(Math, values) : options.chartRangeMin;
+        maxvalue = options.chartRangeMax==undefined ? Math.max.apply(Math, values) : options.chartRangeMax;
+        var target = $(this).simpledraw(width, height, options.composite);
+        if (target && values.length>1) {
+            var canvas_width = target.pixel_width;
+            var canvas_height = target.pixel_height;
+            if (options.raw) {
+                if (options.showOutliers && values.length>5) {
+                    var loutlier=values[0], lwhisker=values[1], q1=values[2], q2=values[3], q3=values[4], rwhisker=values[5], routlier=values[6];
+                } else {
+                    var lwhisker=values[0], q1=values[1], q2=values[2], q3=values[3], rwhisker=values[4];
+                }
+            } else {
+                values.sort(function(a, b) { return a-b; });
+                var q1 = quartile(values, 1);
+                var q2 = quartile(values, 2);
+                var q3 = quartile(values, 3);
+                var iqr = q3-q1;
+                if (options.showOutliers) {
+                    var lwhisker=undefined, rwhisker=undefined;
+                    for(var i=0, vlen=values.length; i<vlen; i++) {
+                        if (lwhisker==undefined && values[i] > q1-(iqr*options.outlierIQR))
+                            lwhisker = values[i];
+                        if (values[i] < q3+(iqr*options.outlierIQR))
+                            rwhisker = values[i];
+                    }
+                    var loutlier = values[0];
+                    var routlier = values[values.length-1];
+                } else {
+                    var lwhisker = values[0];
+                    var rwhisker = values[values.length-1];
+                }
+            }
+
+            var unitsize = canvas_width / (maxvalue-minvalue+1);
+            var canvas_left = 0;
+            if (options.showOutliers) {
+                canvas_left = Math.ceil(options.spotRadius);
+                canvas_width -= 2*Math.ceil(options.spotRadius);
+                var unitsize = canvas_width / (maxvalue-minvalue+1);
+                if (loutlier < lwhisker)
+                    target.drawCircle((loutlier-minvalue)*unitsize+canvas_left, canvas_height/2, options.spotRadius, options.outlierLineColor, options.outlierFillColor);
+                if (routlier > rwhisker)
+                    target.drawCircle((routlier-minvalue)*unitsize+canvas_left, canvas_height/2, options.spotRadius, options.outlierLineColor, options.outlierFillColor);
+            }
+
+            // box
+            target.drawRect(
+                Math.round((q1-minvalue)*unitsize+canvas_left),
+                Math.round(canvas_height*0.1),
+                Math.round((q3-q1)*unitsize), 
+                Math.round(canvas_height*0.8), 
+                options.boxLineColor, 
+                options.boxFillColor);
+            // left whisker
+            target.drawLine(
+                Math.round((lwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/2), 
+                Math.round((q1-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/2), 
+                options.lineColor);
+            target.drawLine(
+                Math.round((lwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/4), 
+                Math.round((lwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height-canvas_height/4), 
+                options.whiskerColor);
+            // right whisker
+            target.drawLine(Math.round((rwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/2), 
+                Math.round((q3-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/2), 
+                options.lineColor);
+            target.drawLine(
+                Math.round((rwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height/4), 
+                Math.round((rwhisker-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height-canvas_height/4), 
+                options.whiskerColor);
+            // median line
+            target.drawLine(
+                Math.round((q2-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height*0.1),
+                Math.round((q2-minvalue)*unitsize+canvas_left), 
+                Math.round(canvas_height*0.9),
+                options.medianColor);
+            if (options.target) {
+                var size = Math.ceil(options.spotRadius);
+                target.drawLine(
+                    Math.round((options.target-minvalue)*unitsize+canvas_left), 
+                    Math.round((canvas_height/2)-size), 
+                    Math.round((options.target-minvalue)*unitsize+canvas_left), 
+                    Math.round((canvas_height/2)+size), 
+                    options.targetColor);
+                target.drawLine(
+                    Math.round((options.target-minvalue)*unitsize+canvas_left-size), 
+                    Math.round(canvas_height/2), 
+                    Math.round((options.target-minvalue)*unitsize+canvas_left+size), 
+                    Math.round(canvas_height/2), 
+                    options.targetColor);
+            }
+        }  else {
+            // Remove the tag contents if sparklines aren't supported
+            this.innerHTML = '';
+        }
+    };
+
+
+    // IE doesn't provide an indexOf method for arrays :-(
+    if (!Array.prototype.indexOf) {
+        Array.prototype.indexOf = function(entry) {
+            for(var i=0, vlen=this.length; i<vlen; i++) {
+                if (this[i] == entry)
+                    return i;
+            }
+            return -1;
+        }
+    }
+
+    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
+    // This is accessible as $(foo).simpledraw()
+
+    if ($.browser.msie && !document.namespaces['v']) {
+        document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+    }
+
+    if ($.browser.hasCanvas == undefined) {
+        var t = document.createElement('canvas');
+        $.browser.hasCanvas = t.getContext!=undefined;
+    }
+
+    var vcanvas_base = function(width, height, target) {
+    };
+
+    vcanvas_base.prototype = {
+        init : function(width, height, target) {
+            this.width = width;
+            this.height = height;
+            this.target = target;
+            if (target[0]) target=target[0];
+            target.vcanvas = this;
+        },
+
+        drawShape : function(path, lineColor, fillColor, lineWidth) {
+            alert('drawShape not implemented');
+        },
+
+        drawLine : function(x1, y1, x2, y2, lineColor, lineWidth) {
+            return this.drawShape([ [x1,y1], [x2,y2] ], lineColor, lineWidth);
+        },
+
+        drawCircle : function(x, y, radius, lineColor, fillColor) {
+            alert('drawCircle not implemented');
+        },
+
+        drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            alert('drawPieSlice not implemented');
+        },
+
+        drawRect : function(x, y, width, height, lineColor, fillColor) {
+            alert('drawRect not implemented');
+        },
+
+        getElement : function() {
+            return this.canvas;
+        },
+
+        _insert : function(el, target) {
+            $(target).html(el);
+        }
+    };
+
+    var vcanvas_canvas = function(width, height, target) {
+        return this.init(width, height, target);
+    };
+
+    vcanvas_canvas.prototype = $.extend(new vcanvas_base, {
+        _super : vcanvas_base.prototype,
+
+        init : function(width, height, target) {
+            this._super.init(width, height, target);
+            this.canvas = document.createElement('canvas');
+            if (target[0]) target=target[0];
+            target.vcanvas = this;
+            $(this.canvas).css({ display:'inline-block', width:width, height:height, verticalAlign:'top' });
+            this._insert(this.canvas, target);
+            this.pixel_height = $(this.canvas).height();
+            this.pixel_width = $(this.canvas).width();
+            this.canvas.width = this.pixel_width;
+            this.canvas.height = this.pixel_height;
+            $(this.canvas).css({width: this.pixel_width, height: this.pixel_height});
+        },
+
+        _getContext : function(lineColor, fillColor, lineWidth) {
+            var context = this.canvas.getContext('2d');
+            if (lineColor != undefined)
+                context.strokeStyle = lineColor;
+            context.lineWidth = lineWidth==undefined ? 1 : lineWidth;
+            if (fillColor != undefined)
+                context.fillStyle = fillColor;
+            return context;
+        },
+
+        drawShape : function(path, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth);
+            context.beginPath();
+            context.moveTo(path[0][0]+0.5, path[0][1]+0.5);
+            for(var i=1, plen=path.length; i<plen; i++) {
+                context.lineTo(path[i][0]+0.5, path[i][1]+0.5); // the 0.5 offset gives us crisp pixel-width lines
+            }
+            if (lineColor != undefined) {
+                context.stroke();
+            }
+            if (fillColor != undefined) {
+                context.fill();
+            }
+        },
+
+        drawCircle : function(x, y, radius, lineColor, fillColor) {
+            var context = this._getContext(lineColor, fillColor);
+            context.beginPath();
+            context.arc(x, y, radius, 0, 2*Math.PI, false);
+            if (lineColor != undefined) {
+                context.stroke();
+            }
+            if (fillColor != undefined) {
+                context.fill();
+            }
+        }, 
+
+        drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var context = this._getContext(lineColor, fillColor);
+            context.beginPath();
+            context.moveTo(x, y);
+            context.arc(x, y, radius, startAngle, endAngle, false);
+            context.lineTo(x, y);
+            context.closePath();
+            if (lineColor != undefined) {
+                context.stroke();
+            }
+            if (fillColor) {
+                context.fill();
+            }
+        },
+
+        drawRect : function(x, y, width, height, lineColor, fillColor) {
+            return this.drawShape([ [x,y], [x+width, y], [x+width, y+height], [x, y+height], [x, y] ], lineColor, fillColor);
+        }
+        
+    });
+
+    var vcanvas_vml = function(width, height, target) {
+        return this.init(width, height, target);
+    };
+
+    vcanvas_vml.prototype = $.extend(new vcanvas_base, {
+        _super : vcanvas_base.prototype,
+
+        init : function(width, height, target) {
+            this._super.init(width, height, target);
+            if (target[0]) target=target[0];
+            target.vcanvas = this;
+            this.canvas = document.createElement('span');
+            $(this.canvas).css({ display:'inline-block', position: 'relative', overflow:'hidden', width:width, height:height, margin:'0px', padding:'0px', verticalAlign: 'top'});
+            this._insert(this.canvas, target);
+            this.pixel_height = $(this.canvas).height();
+            this.pixel_width = $(this.canvas).width();
+            this.canvas.width = this.pixel_width;
+            this.canvas.height = this.pixel_height;;
+            var groupel = '<v:group coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'"'
+                    +' style="position:absolute;top:0;left:0;width:'+this.pixel_width+'px;height='+this.pixel_height+'px;"></v:group>';
+            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
+            this.group = $(this.canvas).children()[0];
+        },
+
+        drawShape : function(path, lineColor, fillColor, lineWidth) {
+            var vpath = [];
+            for(var i=0, plen=path.length; i<plen; i++) {
+                vpath[i] = ''+(path[i][0])+','+(path[i][1]);
+            }
+            var initial = vpath.splice(0,1);
+            lineWidth = lineWidth == undefined ? 1 : lineWidth;
+            var stroke = lineColor == undefined ? ' stroked="false" ' : ' strokeWeight="'+lineWidth+'" strokeColor="'+lineColor+'" ';
+            var fill = fillColor == undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
+            var closed = vpath[0] == vpath[vpath.length-1] ? 'x ' : '';
+            var vel = '<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" '
+                + stroke
+                + fill
+                +' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" '
+                +' path="m '+initial+' l '+vpath.join(', ')+' '+closed+'e">'
+                +' </v:shape>';
+             this.group.insertAdjacentHTML('beforeEnd', vel);
+        },
+
+        drawCircle : function(x, y, radius, lineColor, fillColor) {
+            x -= radius+1;
+            y -= radius+1;
+            var stroke = lineColor == undefined ? ' stroked="false" ' : ' strokeWeight="1" strokeColor="'+lineColor+'" ';
+            var fill = fillColor == undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
+            var vel = '<v:oval '
+                + stroke
+                + fill
+                +' style="position:absolute;top:'+y+'px; left:'+x+'px; width:'+(radius*2)+'px; height:'+(radius*2)+'px"></v:oval>';
+            this.group.insertAdjacentHTML('beforeEnd', vel);
+            
+        },
+        
+        drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            if (startAngle == endAngle) {
+                return;  // VML seems to have problem when start angle equals end angle.
+            }
+            if ((endAngle - startAngle) == (2*Math.PI)) {
+                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
+                endAngle = (2*Math.PI);
+            }
+
+            var startx = x + Math.round(Math.cos(startAngle) * radius);
+            var starty = y + Math.round(Math.sin(startAngle) * radius);
+            var endx = x + Math.round(Math.cos(endAngle) * radius);
+            var endy = y + Math.round(Math.sin(endAngle) * radius);
+
+            // Prevent very small slices from being mistaken as a whole pie
+            if (startx==endx && starty==endy && (endAngle-startAngle) < Math.PI)
+                return;
+
+            var vpath = [  x-radius, y-radius, x+radius, y+radius, startx, starty, endx, endy ]; 
+            var stroke = lineColor == undefined ? ' stroked="false" ' : ' strokeWeight="1" strokeColor="'+lineColor+'" ';
+            var fill = fillColor == undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
+            var vel = '<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" '
+                + stroke
+                + fill
+                +' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" '
+                +' path="m '+x+','+y+' wa '+vpath.join(', ')+' x e">'
+                +' </v:shape>';
+             this.group.insertAdjacentHTML('beforeEnd', vel);
+        },
+
+        drawRect : function(x, y, width, height, lineColor, fillColor) {
+            return this.drawShape( [ [x, y], [x, y+height], [x+width, y+height], [x+width, y], [x, y] ], lineColor, fillColor);
+        }
+    });
+
+})(jQuery);
diff --git a/lib/jquery.sparkline.min.js b/lib/jquery.sparkline.min.js
new file mode 100644
index 0000000..08a30bf
--- /dev/null
+++ b/lib/jquery.sparkline.min.js
@@ -0,0 +1,85 @@
+/* jquery.sparkline 1.5.1 - http://omnipotent.net/jquery.sparkline/ */
+
+(function($){$.fn.simpledraw=function(width,height,use_existing){if(use_existing&&this[0].vcanvas)return this[0].vcanvas;if(width==undefined)width=$(this).innerWidth();if(height==undefined)height=$(this).innerHeight();if($.browser.hasCanvas){return new vcanvas_canvas(width,height,this);}else if($.browser.msie){return new vcanvas_vml(width,height,this);}else{return false;}};var pending=[];$.fn.sparkline=function(uservalues,options){var options=$.extend({type:'line',lineColor:'#00f',fillColor:'#cdf',defaultPixelsPerValue:3,width:'auto',height:'auto',composite:false},options?options:{});return this.each(function(){var render=function(){var values=(uservalues=='html'||uservalues==undefined)?$(this).text().split(','):uservalues;var width=options.width=='auto'?values.length*options.defaultPixelsPerValue:options.width;if(options.height=='auto'){if(!options.composite||!this.vcanvas){var tmp=document.createElement('span');tmp.innerHTML='a';$(this).html(tmp);height=$(tmp).innerHeight();$(tmp).remove();}}else{height=options.height;}
+$.fn.sparkline[options.type].call(this,values,options,width,height);}
+if(($(this).html()&&$(this).is(':hidden'))||($.fn.jquery<"1.3.0"&&$(this).parents().is(':hidden'))){pending.push([this,render]);}else{render.call(this);}});};$.sparkline_display_visible=function(){for(var i=pending.length-1;i>=0;i--){var el=pending[i][0];if($(el).is(':visible')&&!$(el).parents().is(':hidden')){pending[i][1].call(el);pending.splice(i,1);}}};$.fn.sparkline.line=function(values,options,width,height){var options=$.extend({spotColor:'#f80',spotRadius:1.5,minSpotColor:'#f80',maxSpotColor:'#f80',lineWidth:1,normalRangeMin:undefined,normalRangeMax:undefined,normalRangeColor:'#ccc',chartRangeMin:undefined,chartRangeMax:undefined,chartRangeMinX:undefined,chartRangeMaxX:undefined},options?options:{});var xvalues=[],yvalues=[],yminmax=[];for(i=0;i<values.length;i++){var v=values[i];var isstr=typeof(values[i])=='string';var isarray=typeof(values[i])=='object'&&values[i]instanceof Array;var sp=isstr&&values[i].split(':');if(isstr&&sp.length==2){xvalues.push(Number(sp[0]));yvalues.push(Number(sp[1]));yminmax.push(Number(sp[1]));}else if(isarray){xvalues.push(values[i][0]);yvalues.push(values[i][1]);yminmax.push(values[i][1]);}else{xvalues.push(i);if(values[i]===null||values[i]=='null'){yvalues.push(null);}else{yvalues.push(Number(values[i]));yminmax.push(Number(values[i]));}}}
+if(options.xvalues){xvalues=options.xvalues;}
+var maxy=Math.max.apply(Math,yminmax);var maxyval=maxy;var miny=Math.min.apply(Math,yminmax);var minyval=miny;var maxx=Math.max.apply(Math,xvalues);var maxxval=maxx;var minx=Math.min.apply(Math,xvalues);var minxval=minx;if(options.normalRangeMin!=undefined){if(options.normalRangeMin<miny)
+miny=options.normalRangeMin;if(options.normalRangeMax>maxy)
+maxy=options.normalRangeMax;}
+if(options.chartRangeMin!=undefined&&(options.chartRangeClip||options.chartRangeMin<miny)){miny=options.chartRangeMin;}
+if(options.chartRangeMax!=undefined&&(options.chartRangeClip||options.chartRangeMax>maxy)){maxy=options.chartRangeMax;}
+if(options.chartRangeMinX!=undefined&&(options.chartRangeClipX||options.chartRangeMinX<minx)){minx=options.chartRangeMinX;}
+if(options.chartRangeMaxX!=undefined&&(options.chartRangeClipX||options.chartRangeMaxX>maxx)){maxx=options.chartRangeMaxX;}
+var rangex=maxx-minx==0?1:maxx-minx;var rangey=maxy-miny==0?1:maxy-miny;var vl=yvalues.length-1;if(vl<1){this.innerHTML='';return;}
+var target=$(this).simpledraw(width,height,options.composite);if(target){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;var canvas_top=0;var canvas_left=0;if(options.spotRadius&&(canvas_width<(options.spotRadius*4)||canvas_height<(options.spotRadius*4))){options.spotRadius=0;}
+if(options.spotRadius){if(options.minSpotColor||(options.spotColor&&yvalues[vl]==miny))
+canvas_height-=Math.ceil(options.spotRadius);if(options.maxSpotColor||(options.spotColor&&yvalues[vl]==maxy)){canvas_height-=Math.ceil(options.spotRadius);canvas_top+=Math.ceil(options.spotRadius);}
+if(options.minSpotColor||options.maxSpotColor&&(yvalues[0]==miny||yvalues[0]==maxy)){canvas_left+=Math.ceil(options.spotRadius);canvas_width-=Math.ceil(options.spotRadius);}
+if(options.spotColor||(options.minSpotColor||options.maxSpotColor&&(yvalues[vl]==miny||yvalues[vl]==maxy)))
+canvas_width-=Math.ceil(options.spotRadius);}
+canvas_height--;if(options.normalRangeMin!=undefined){var ytop=canvas_top+Math.round(canvas_height-(canvas_height*((options.normalRangeMax-miny)/rangey)));var height=Math.round((canvas_height*(options.normalRangeMax-options.normalRangeMin))/rangey);target.drawRect(canvas_left,ytop,canvas_width,height,undefined,options.normalRangeColor);}
+var path=[];var paths=[path];for(var i=0,vlen=yvalues.length;i<vlen;i++){var x=xvalues[i],y=yvalues[i];if(y===null){if(i){if(yvalues[i-1]!==null){path=[];paths.push(path);}}}else{if(y<miny)y=miny;if(y>maxy)y=maxy;if(!path.length){path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)),canvas_top+canvas_height]);}
+path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)),canvas_top+Math.round(canvas_height-(canvas_height*((y-miny)/rangey)))]);}}
+for(var i=0,plen=paths.length;i<plen;i++){path=paths[i];if(!path.length)
+continue;if(options.fillColor){path.push([path[path.length-1][0],canvas_top+canvas_height-1]);target.drawShape(path,undefined,options.fillColor);path.pop();}
+if(path.length>2){path[0]=[path[0][0],path[1][1]];}
+target.drawShape(path,options.lineColor,undefined,options.lineWidth);}
+if(options.spotRadius&&options.spotColor){target.drawCircle(canvas_left+Math.round(xvalues[xvalues.length-1]*(canvas_width/rangex)),canvas_top+Math.round(canvas_height-(canvas_height*((yvalues[vl]-miny)/rangey))),options.spotRadius,undefined,options.spotColor);}
+if(maxy!=minyval){if(options.spotRadius&&options.minSpotColor){var x=xvalues[yvalues.indexOf(minyval)];target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)),canvas_top+Math.round(canvas_height-(canvas_height*((minyval-miny)/rangey))),options.spotRadius,undefined,options.minSpotColor);}
+if(options.spotRadius&&options.maxSpotColor){var x=xvalues[yvalues.indexOf(maxyval)];target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)),canvas_top+Math.round(canvas_height-(canvas_height*((maxyval-miny)/rangey))),options.spotRadius,undefined,options.maxSpotColor);}}}else{this.innerHTML='';}};$.fn.sparkline.bar=function(values,options,width,height){var options=$.extend({type:'bar',barColor:'#00f',negBarColor:'#f44',zeroColor:undefined,nullColor:undefined,zeroAxis:undefined,barWidth:4,barSpacing:1,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:false,colorMap:undefined},options?options:{});var width=(values.length*options.barWidth)+((values.length-1)*options.barSpacing);var num_values=[];for(var i=0,vlen=values.length;i<vlen;i++){if(values[i]=='null'||values[i]===null){values[i]=null;}else{values[i]=Number(values[i]);num_values.push(Number(values[i]));}}
+var max=Math.max.apply(Math,num_values);var min=Math.min.apply(Math,num_values);if(options.chartRangeMin!=undefined&&(options.chartRangeClip||options.chartRangeMin<min)){min=options.chartRangeMin;}
+if(options.chartRangeMax!=undefined&&(options.chartRangeClip||options.chartRangeMax>max)){max=options.chartRangeMax;}
+if(options.zeroAxis==undefined)options.zeroAxis=min<0;var range=max-min==0?1:max-min;if($.isArray(options.colorMap)){var colorMapByIndex=options.colorMap;var colorMapByValue=null;}else{var colorMapByIndex=null;var colorMapByValue=options.colorMap;}
+var target=$(this).simpledraw(width,height,options.composite);if(target){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;var yzero=min<0&&options.zeroAxis?canvas_height-Math.round(canvas_height*(Math.abs(min)/range))-1:canvas_height-1;for(var i=0,vlen=values.length;i<vlen;i++){var x=i*(options.barWidth+options.barSpacing);var val=values[i];if(val===null){if(options.nullColor){color=options.nullColor;val=(options.zeroAxis&&min<0)?0:min;var height=1;var y=(options.zeroAxis&&min<0)?yzero:canvas_height-height;}else{continue;}}else{if(val<min)val=min;if(val>max)val=max;var color=(val<0)?options.negBarColor:options.barColor;if(options.zeroAxis&&min<0){var height=Math.round(canvas_height*((Math.abs(val)/range)))+1;var y=(val<0)?yzero:yzero-height;}else{var height=Math.round(canvas_height*((val-min)/range))+1;var y=canvas_height-height;}
+if(val==0&&options.zeroColor!=undefined){color=options.zeroColor;}
+if(colorMapByValue&&colorMapByValue[val]){color=colorMapByValue[val];}else if(colorMapByIndex&&colorMapByIndex.length>i){color=colorMapByIndex[i];}
+if(color===null){continue;}}
+target.drawRect(x,y,options.barWidth-1,height-1,color,color);}}else{this.innerHTML='';}};$.fn.sparkline.tristate=function(values,options,width,height){values=$.map(values,Number);var options=$.extend({barWidth:4,barSpacing:1,posBarColor:'#6f6',negBarColor:'#f44',zeroBarColor:'#999',colorMap:{}},options);var width=(values.length*options.barWidth)+((values.length-1)*options.barSpacing);if($.isArray(options.colorMap)){var colorMapByIndex=options.colorMap;var colorMapByValue=null;}else{var colorMapByIndex=null;var colorMapByValue=options.colorMap;}
+var target=$(this).simpledraw(width,height,options.composite);if(target){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;var half_height=Math.round(canvas_height/2);for(var i=0,vlen=values.length;i<vlen;i++){var x=i*(options.barWidth+options.barSpacing);if(values[i]<0){var y=half_height;var height=half_height-1;var color=options.negBarColor;}else if(values[i]>0){var y=0;var height=half_height-1;var color=options.posBarColor;}else{var y=half_height-1;var height=2;var color=options.zeroBarColor;}
+if(colorMapByValue&&colorMapByValue[values[i]]){color=colorMapByValue[values[i]];}else if(colorMapByIndex&&colorMapByIndex.length>i){color=colorMapByIndex[i];}
+if(color===null){continue;}
+target.drawRect(x,y,options.barWidth-1,height-1,color,color);}}else{this.innerHTML='';}};$.fn.sparkline.discrete=function(values,options,width,height){values=$.map(values,Number);var options=$.extend({lineHeight:'auto',thresholdColor:undefined,thresholdValue:0,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:false},options);width=options.width=='auto'?values.length*2:width;var interval=Math.floor(width/values.length);var target=$(this).simpledraw(width,height,options.composite);if(target){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;var line_height=options.lineHeight=='auto'?Math.round(canvas_height*0.3):options.lineHeight;var pheight=canvas_height-line_height;var min=Math.min.apply(Math,values);var max=Math.max.apply(Math,values);if(options.chartRangeMin!=undefined&&(options.chartRangeClip||options.chartRangeMin<min)){min=options.chartRangeMin;}
+if(options.chartRangeMax!=undefined&&(options.chartRangeClip||options.chartRangeMax>max)){max=options.chartRangeMax;}
+var range=max-min;for(var i=0,vlen=values.length;i<vlen;i++){var val=values[i];if(val<min)val=min;if(val>max)val=max;var x=(i*interval);var ytop=Math.round(pheight-pheight*((val-min)/range));target.drawLine(x,ytop,x,ytop+line_height,(options.thresholdColor&&val<options.thresholdValue)?options.thresholdColor:options.lineColor);}}else{this.innerHTML='';}};$.fn.sparkline.bullet=function(values,options,width,height){values=$.map(values,Number);var options=$.extend({targetColor:'red',targetWidth:3,performanceColor:'blue',rangeColors:['#D3DAFE','#A8B6FF','#7F94FF'],base:undefined},options);width=options.width=='auto'?'4.0em':width;var target=$(this).simpledraw(width,height,options.composite);if(target&&values.length>1){var canvas_width=target.pixel_width-Math.ceil(options.targetWidth/2);var canvas_height=target.pixel_height;var min=Math.min.apply(Math,values);var max=Math.max.apply(Math,values);if(options.base==undefined){var min=min<0?min:0;}else{min=options.base;}
+var range=max-min;for(i=2,vlen=values.length;i<vlen;i++){var rangeval=parseInt(values[i]);var rangewidth=Math.round(canvas_width*((rangeval-min)/range));target.drawRect(0,0,rangewidth-1,canvas_height-1,options.rangeColors[i-2],options.rangeColors[i-2]);}
+var perfval=parseInt(values[1]);var perfwidth=Math.round(canvas_width*((perfval-min)/range));target.drawRect(0,Math.round(canvas_height*0.3),perfwidth-1,Math.round(canvas_height*0.4)-1,options.performanceColor,options.performanceColor);var targetval=parseInt(values[0]);var x=Math.round(canvas_width*((targetval-min)/range)-(options.targetWidth/2));var targettop=Math.round(canvas_height*0.10);var targetheight=canvas_height-(targettop*2);target.drawRect(x,targettop,options.targetWidth-1,targetheight-1,options.targetColor,options.targetColor);}else{this.innerHTML='';}};$.fn.sparkline.pie=function(values,options,width,height){values=$.map(values,Number);var options=$.extend({sliceColors:['#f00','#0f0','#00f']},options);width=options.width=='auto'?height:width;var target=$(this).simpledraw(width,height,options.composite);if(target&&values.length>1){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;var radius=Math.floor(Math.min(canvas_width,canvas_height)/2);var total=0;for(var i=0,vlen=values.length;i<vlen;i++)
+total+=values[i];var next=0;if(options.offset){next+=(2*Math.PI)*(options.offset/360);}
+var circle=2*Math.PI;for(var i=0,vlen=values.length;i<vlen;i++){var start=next;var end=next;if(total>0){end=next+(circle*(values[i]/total));}
+target.drawPieSlice(radius,radius,radius,start,end,undefined,options.sliceColors[i%options.sliceColors.length]);next=end;}}};function quartile(values,q){if(q==2){var vl2=Math.floor(values.length/2);return values.length%2?values[vl2]:(values[vl2]+values[vl2+1])/2;}else{var vl4=Math.floor(values.length/4);return values.length%2?(values[vl4*q]+values[vl4*q+1])/2:values[vl4*q];}};$.fn.sparkline.box=function(values,options,width,height){values=$.map(values,Number);var options=$.extend({raw:false,boxLineColor:'black',boxFillColor:'#cdf',whiskerColor:'black',outlierLineColor:'#333',outlierFillColor:'white',medianColor:'red',showOutliers:true,outlierIQR:1.5,spotRadius:1.5,target:undefined,targetColor:'#4a2',chartRangeMax:undefined,chartRangeMin:undefined},options);width=options.width=='auto'?'4.0em':width;minvalue=options.chartRangeMin==undefined?Math.min.apply(Math,values):options.chartRangeMin;maxvalue=options.chartRangeMax==undefined?Math.max.apply(Math,values):options.chartRangeMax;var target=$(this).simpledraw(width,height,options.composite);if(target&&values.length>1){var canvas_width=target.pixel_width;var canvas_height=target.pixel_height;if(options.raw){if(options.showOutliers&&values.length>5){var loutlier=values[0],lwhisker=values[1],q1=values[2],q2=values[3],q3=values[4],rwhisker=values[5],routlier=values[6];}else{var lwhisker=values[0],q1=values[1],q2=values[2],q3=values[3],rwhisker=values[4];}}else{values.sort(function(a,b){return a-b;});var q1=quartile(values,1);var q2=quartile(values,2);var q3=quartile(values,3);var iqr=q3-q1;if(options.showOutliers){var lwhisker=undefined,rwhisker=undefined;for(var i=0,vlen=values.length;i<vlen;i++){if(lwhisker==undefined&&values[i]>q1-(iqr*options.outlierIQR))
+lwhisker=values[i];if(values[i]<q3+(iqr*options.outlierIQR))
+rwhisker=values[i];}
+var loutlier=values[0];var routlier=values[values.length-1];}else{var lwhisker=values[0];var rwhisker=values[values.length-1];}}
+var unitsize=canvas_width/(maxvalue-minvalue+1);var canvas_left=0;if(options.showOutliers){canvas_left=Math.ceil(options.spotRadius);canvas_width-=2*Math.ceil(options.spotRadius);var unitsize=canvas_width/(maxvalue-minvalue+1);if(loutlier<lwhisker)
+target.drawCircle((loutlier-minvalue)*unitsize+canvas_left,canvas_height/2,options.spotRadius,options.outlierLineColor,options.outlierFillColor);if(routlier>rwhisker)
+target.drawCircle((routlier-minvalue)*unitsize+canvas_left,canvas_height/2,options.spotRadius,options.outlierLineColor,options.outlierFillColor);}
+target.drawRect(Math.round((q1-minvalue)*unitsize+canvas_left),Math.round(canvas_height*0.1),Math.round((q3-q1)*unitsize),Math.round(canvas_height*0.8),options.boxLineColor,options.boxFillColor);target.drawLine(Math.round((lwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height/2),Math.round((q1-minvalue)*unitsize+canvas_left),Math.round(canvas_height/2),options.lineColor);target.drawLine(Math.round((lwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height/4),Math.round((lwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height-canvas_height/4),options.whiskerColor);target.drawLine(Math.round((rwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height/2),Math.round((q3-minvalue)*unitsize+canvas_left),Math.round(canvas_height/2),options.lineColor);target.drawLine(Math.round((rwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height/4),Math.round((rwhisker-minvalue)*unitsize+canvas_left),Math.round(canvas_height-canvas_height/4),options.whiskerColor);target.drawLine(Math.round((q2-minvalue)*unitsize+canvas_left),Math.round(canvas_height*0.1),Math.round((q2-minvalue)*unitsize+canvas_left),Math.round(canvas_height*0.9),options.medianColor);if(options.target){var size=Math.ceil(options.spotRadius);target.drawLine(Math.round((options.target-minvalue)*unitsize+canvas_left),Math.round((canvas_height/2)-size),Math.round((options.target-minvalue)*unitsize+canvas_left),Math.round((canvas_height/2)+size),options.targetColor);target.drawLine(Math.round((options.target-minvalue)*unitsize+canvas_left-size),Math.round(canvas_height/2),Math.round((options.target-minvalue)*unitsize+canvas_left+size),Math.round(canvas_height/2),options.targetColor);}}else{this.innerHTML='';}};if(!Array.prototype.indexOf){Array.prototype.indexOf=function(entry){for(var i=0,vlen=this.length;i<vlen;i++){if(this[i]==entry)
+return i;}
+return-1;}}
+if($.browser.msie&&!document.namespaces['v']){document.namespaces.add('v','urn:schemas-microsoft-com:vml','#default#VML');}
+if($.browser.hasCanvas==undefined){var t=document.createElement('canvas');$.browser.hasCanvas=t.getContext!=undefined;}
+var vcanvas_base=function(width,height,target){};vcanvas_base.prototype={init:function(width,height,target){this.width=width;this.height=height;this.target=target;if(target[0])target=target[0];target.vcanvas=this;},drawShape:function(path,lineColor,fillColor,lineWidth){alert('drawShape not implemented');},drawLine:function(x1,y1,x2,y2,lineColor,lineWidth){return this.drawShape([[x1,y1],[x2,y2]],lineColor,lineWidth);},drawCircle:function(x,y,radius,lineColor,fillColor){alert('drawCircle not implemented');},drawPieSlice:function(x,y,radius,startAngle,endAngle,lineColor,fillColor){alert('drawPieSlice not implemented');},drawRect:function(x,y,width,height,lineColor,fillColor){alert('drawRect not implemented');},getElement:function(){return this.canvas;},_insert:function(el,target){$(target).html(el);}};var vcanvas_canvas=function(width,height,target){return this.init(width,height,target);};vcanvas_canvas.prototype=$.extend(new vcanvas_base,{_super:vcanvas_base.prototype,init:function(width,height,target){this._super.init(width,height,target);this.canvas=document.createElement('canvas');if(target[0])target=target[0];target.vcanvas=this;$(this.canvas).css({display:'inline-block',width:width,height:height,verticalAlign:'top'});this._insert(this.canvas,target);this.pixel_height=$(this.canvas).height();this.pixel_width=$(this.canvas).width();this.canvas.width=this.pixel_width;this.canvas.height=this.pixel_height;$(this.canvas).css({width:this.pixel_width,height:this.pixel_height});},_getContext:function(lineColor,fillColor,lineWidth){var context=this.canvas.getContext('2d');if(lineColor!=undefined)
+context.strokeStyle=lineColor;context.lineWidth=lineWidth==undefined?1:lineWidth;if(fillColor!=undefined)
+context.fillStyle=fillColor;return context;},drawShape:function(path,lineColor,fillColor,lineWidth){var context=this._getContext(lineColor,fillColor,lineWidth);context.beginPath();context.moveTo(path[0][0]+0.5,path[0][1]+0.5);for(var i=1,plen=path.length;i<plen;i++){context.lineTo(path[i][0]+0.5,path[i][1]+0.5);}
+if(lineColor!=undefined){context.stroke();}
+if(fillColor!=undefined){context.fill();}},drawCircle:function(x,y,radius,lineColor,fillColor){var context=this._getContext(lineColor,fillColor);context.beginPath();context.arc(x,y,radius,0,2*Math.PI,false);if(lineColor!=undefined){context.stroke();}
+if(fillColor!=undefined){context.fill();}},drawPieSlice:function(x,y,radius,startAngle,endAngle,lineColor,fillColor){var context=this._getContext(lineColor,fillColor);context.beginPath();context.moveTo(x,y);context.arc(x,y,radius,startAngle,endAngle,false);context.lineTo(x,y);context.closePath();if(lineColor!=undefined){context.stroke();}
+if(fillColor){context.fill();}},drawRect:function(x,y,width,height,lineColor,fillColor){return this.drawShape([[x,y],[x+width,y],[x+width,y+height],[x,y+height],[x,y]],lineColor,fillColor);}});var vcanvas_vml=function(width,height,target){return this.init(width,height,target);};vcanvas_vml.prototype=$.extend(new vcanvas_base,{_super:vcanvas_base.prototype,init:function(width,height,target){this._super.init(width,height,target);if(target[0])target=target[0];target.vcanvas=this;this.canvas=document.createElement('span');$(this.canvas).css({display:'inline-block',position:'relative',overflow:'hidden',width:width,height:height,margin:'0px',padding:'0px',verticalAlign:'top'});this._insert(this.canvas,target);this.pixel_height=$(this.canvas).height();this.pixel_width=$(this.canvas).width();this.canvas.width=this.pixel_width;this.canvas.height=this.pixel_height;;var groupel='<v:group coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'"'
++' style="position:absolute;top:0;left:0;width:'+this.pixel_width+'px;height='+this.pixel_height+'px;"></v:group>';this.canvas.insertAdjacentHTML('beforeEnd',groupel);this.group=$(this.canvas).children()[0];},drawShape:function(path,lineColor,fillColor,lineWidth){var vpath=[];for(var i=0,plen=path.length;i<plen;i++){vpath[i]=''+(path[i][0])+','+(path[i][1]);}
+var initial=vpath.splice(0,1);lineWidth=lineWidth==undefined?1:lineWidth;var stroke=lineColor==undefined?' stroked="false" ':' strokeWeight="'+lineWidth+'" strokeColor="'+lineColor+'" ';var fill=fillColor==undefined?' filled="false"':' fillColor="'+fillColor+'" filled="true" ';var closed=vpath[0]==vpath[vpath.length-1]?'x ':'';var vel='<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" '
++stroke
++fill
++' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" '
++' path="m '+initial+' l '+vpath.join(', ')+' '+closed+'e">'
++' </v:shape>';this.group.insertAdjacentHTML('beforeEnd',vel);},drawCircle:function(x,y,radius,lineColor,fillColor){x-=radius+1;y-=radius+1;var stroke=lineColor==undefined?' stroked="false" ':' strokeWeight="1" strokeColor="'+lineColor+'" ';var fill=fillColor==undefined?' filled="false"':' fillColor="'+fillColor+'" filled="true" ';var vel='<v:oval '
++stroke
++fill
++' style="position:absolute;top:'+y+'px; left:'+x+'px; width:'+(radius*2)+'px; height:'+(radius*2)+'px"></v:oval>';this.group.insertAdjacentHTML('beforeEnd',vel);},drawPieSlice:function(x,y,radius,startAngle,endAngle,lineColor,fillColor){if(startAngle==endAngle){return;}
+if((endAngle-startAngle)==(2*Math.PI)){startAngle=0.0;endAngle=(2*Math.PI);}
+var startx=x+Math.round(Math.cos(startAngle)*radius);var starty=y+Math.round(Math.sin(startAngle)*radius);var endx=x+Math.round(Math.cos(endAngle)*radius);var endy=y+Math.round(Math.sin(endAngle)*radius);if(startx==endx&&starty==endy&&(endAngle-startAngle)<Math.PI)
+return;var vpath=[x-radius,y-radius,x+radius,y+radius,startx,starty,endx,endy];var stroke=lineColor==undefined?' stroked="false" ':' strokeWeight="1" strokeColor="'+lineColor+'" ';var fill=fillColor==undefined?' filled="false"':' fillColor="'+fillColor+'" filled="true" ';var vel='<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" '
++stroke
++fill
++' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" '
++' path="m '+x+','+y+' wa '+vpath.join(', ')+' x e">'
++' </v:shape>';this.group.insertAdjacentHTML('beforeEnd',vel);},drawRect:function(x,y,width,height,lineColor,fillColor){return this.drawShape([[x,y],[x,y+height],[x+width,y+height],[x+width,y],[x,y]],lineColor,fillColor);}});})(jQuery);
\ No newline at end of file
diff --git a/src/Y/core.js b/src/Y/core.js
index 0a14fee..bc22ed7 100644
--- a/src/Y/core.js
+++ b/src/Y/core.js
@@ -39,10 +39,10 @@ function attr(o, key, value, def){
 function extend( A, B ){
     return slice.call(arguments,1).reduce(extend._extendall, A);
 }
-extend._extendall = function(A, donor){
+extend._extendall = function _extendall(A, donor){
     return reduce(donor, extend._set, A);
 };
-extend._set = function(o, v, k){
+extend._set = function _set(o, v, k){
     return attr(o, k, v, o[k]);
 };
 
diff --git a/src/Y/modules/y.event.js b/src/Y/modules/y.event.js
index 4d32a13..8b8cdce 100644
--- a/src/Y/modules/y.event.js
+++ b/src/Y/modules/y.event.js
@@ -1,7 +1,7 @@
 (function(Y, undefined){
 
-
 var 
+ns = Y.event = {}
 
 /**
  * A simple event.
@@ -9,30 +9,25 @@ var
  * TODO: If DOM event, wrap with consistent API.
  * TODO: use jQuery if present to wrap events.
  */
-YEvent = Y.YObject.subclass('YEvent', {
-    init : function( type, target, triggerTarget, data ){
+, YEvent = ns.YEvent = 
+Y.YObject.subclass('YEvent', {
+    init : function( type, target, trigger, data ){
         data = data || {};
+        for (var k in data) this[k] = data[k];
+        this.data = this._o = data;
+        
         this.type = type;
-        this.target = target || triggerTarget;
-        this.triggerTarget = triggerTarget || target;
-        this._o = this.data = data;
+        this.target = target || trigger;
+        this.trigger = trigger || target;
     },
     
     toString: function(){ return "YEvent("+this.type+")"; }
-}),
+})
 
 /**
  * A simple multicaster.
  */
-
-methods = {
-    'init' : function(target){
-        this.target = target || this;
-        this.queues = {};
-        this.decorate(this); // i be so tricky tricky
-        this.decorate(target);
-    },
-    
+, methods = {
     getQueue : function(evt){
         var Qs = this.queues;
         if ( !Qs[evt] )
@@ -47,30 +42,21 @@ methods = {
     
     removeEventListener : function(evt, fn){
         this.getQueue(evt).remove(fn);
-        // var q = this.getQueue(evt),
-        //     idx = q.indexOf(fn);
-        // if (idx !== -1)
-        //     return q.splice(idx, 1);
     },
     
-    fire : function(evtname, triggerTarget, data, async){
-        var self = this,
-            evt = new YEvent(evtname, self.target, triggerTarget, data);
+    fire : function(evtname, trigger, data, async){
+        var evt = new YEvent(evtname, this.target, trigger, data);
         if (async)
-            setTimeout(function(){
-                self.dispatchEvent(evt);
-            }, 10);
+            setTimeout(this.dispatchEvent.bind(this, evt), 10);
         else
-            self.dispatchEvent(evt);
+            this.dispatchEvent(evt);
         return evt;
     },
     
     // XXX: does not handle degenerate or recursive event dispatch
     dispatchEvent : function(evt){
-        // log.debug('dispatchEvent('+evt.type+')', this);
         this.getQueue(evt.type).invoke('call', evt.target, evt);
-        // for (var i=0, q = this.getQueue(evt.type), L = q.length; i<L; i++)
-        //     q[i].call(evt.target, evt);
+        if (this.parent) this.parent.fire(evt.type, evt.trigger, evt.data);
         return evt;
     },
     
@@ -80,22 +66,31 @@ methods = {
     decorate : function(delegate){
         if (!delegate) return;
         for (var k in methods)
-            if (k !== 'init') delegate[k] = methods[k].bind(this);
+            delegate[k] = methods[k].bind(this);
         return delegate;
     }
-},
+}
 
-Emitter = Y.YObject.subclass('Emitter', methods),
+, Emitter = ns.Emitter =
+Y.YObject.subclass('Emitter', 
+    Y.extend({
+        'init' : function(target, parent){
+            this.queues = {};
+            
+            this.target = target || this;
+            if (parent && parent !== target)
+                self.parent = parent;
+            
+            this.decorate(this); // i be so tricky tricky (it binds all methods)
+            if (target) this.decorate(target);
+        }
+    }, methods) )
+;
+Emitter.methods = methods;
 
 // Global Event Hub
-emitter = new Emitter();
-
-Y.event = {
-    Emitter : Emitter,
-    YEvent  : YEvent,
-    globalEmitter : emitter
-};
+Emitter.global = new Emitter()
+Emitter.global.decorate(Y.event);
 
-emitter.decorate(Y.event);
 
 })(this.Y);
diff --git a/src/Y/y-function.js b/src/Y/y-function.js
index e729d92..ef502f9 100644
--- a/src/Y/y-function.js
+++ b/src/Y/y-function.js
@@ -102,15 +102,15 @@ function chain(f,g){
     if ( g.__sequence__ )
         fns = g.__sequence__.concat( fns.slice(1) );
     
-    var wrapper = function(){
-            var args = Y(arguments)
-            ,   i = fns.length;
-            while (i-- > 0) args = fns[i].call(this, x);
-            return args;
-        };
+    function chained(){
+        var args = Y(arguments)
+        ,   i = fns.length;
+        while (i-- > 0) args = fns[i].call(this, x);
+        return args;
+    }
     
-    wrapper.__sequence__ = fns;
-    return wrapper;
+    chained.__sequence__ = fns;
+    return chained;
 }
 
 // YFunction.prototype.lazy = methodize(lazy);
@@ -145,7 +145,8 @@ function splat(fn, x){
 }
 
 var _bind = _Function.prototype.bind;
-YFunction.prototype.bind = function(context, args){
+YFunction.prototype.bind =
+function bind(context, args){
     var bound = _bind.apply(this, arguments);
     bound.__wraps__ = this;
     return Y(bound);
@@ -153,7 +154,7 @@ YFunction.prototype.bind = function(context, args){
 
 
 // Remembers arguments but obeys current context
-YFunction.prototype.partial = partial;
+YFunction.prototype.partial =
 function partial(){
     var fn = this
     ,   args = Y(arguments)
@@ -162,7 +163,7 @@ function partial(){
         };
     partially.__wraps__ = fn;
     return Y(partially);
-}
+};
 
 
 Y.genericize = genericize;
@@ -172,20 +173,23 @@ function genericize( fn ) {
         return fn.__genericized__;
     
     var g = fn.__genericized__ =
-        function(){
+        function genericized(){
             var args = Y(arguments), self = args.shift();
             return fn.apply(self, args);
         };
     g.__wraps__ = fn;
     return Y(g);
-}
+};
 
 // Only works for arguments whose toString is unique and stateless (for example, primitives, but not closures).
 // XXX: hashCode()
 Y.memoize = memoize;
 YFunction.prototype.memoize = methodize(memoize);
 function memoize(fn){
-    var cache = {};
+    if (fn.__memoized__) return fn.__memoized__;
+    var cache;
+    
+    fn.__memoized__ = memorizer;
     function memorizer(){
         // I'd like to use toJSON here, but that won't work cross-browser.
         var key = Y(arguments).join('\0');
@@ -194,14 +198,19 @@ function memoize(fn){
         return cache[key];
     }
     
+    memorizer.purge = purge;
+    function purge(){
+        memorizer.cache = cache = {};
+    }
+    
+    purge();
     memorizer.__wraps__ = fn;
-    memorizer.__cache__ = cache;
+    
     return memorizer;
 }
 
 // Memorized to reduce eval costs
 var
-n = 4,
 _ofArityWrapper =
 YFunction._ofArityWrapper =
     memoize(function(n, limit){
diff --git a/src/evt/evt.class.js b/src/evt/evt.class.js
new file mode 100644
index 0000000..c2596af
--- /dev/null
+++ b/src/evt/evt.class.js
@@ -0,0 +1,202 @@
+(function(undefined){
+var Evt = this.Evt = (this.Evt || {});
+
+// Inspired by John Resig's "Simple Class Inheritence" -- http://ejohn.org/blog/simple-javascript-inheritance/
+/*
+Metaprogramming API
+
+Events
+- "create" -- Fired when a new class instance is created. Data: self
+- "destroy" -- Fired when an instance is destoryed. Data: self
+- "init" -- Fired when the initialiser is invoked. Note that subclasses of the listened class will fire this event. Data: self
+- "subclass" -- Fired when a new subclass is created. Data: parent, self, body
+
+Customization Protocols
+- init() -- Initialiser; fires "init" event.
+- destroy() -- Should clean up resources and release weak references; fires "destroy" event.
+- extended(name, child, body) -- Called when a new subclass is created. Returns new child class.
+
+Class Methods
+- subclass(name, body) -- Fires "subclass" event.
+- fabricate() -- Generates a new class instance but does not inistialise it.
+- instantiate([args...])
+- methods()
+- properties()
+
+Note: Metaprogramming events cannot depend on Class.
+*/
+
+
+
+var KNOWN_CLASSES = Class.KNOWN_CLASSES = {};
+
+// Private delegating constructor -- must be defined for every
+// new class to prevent shared state. All construction is
+// actually done in the init method.
+function _Class() {
+    var cls = arguments.callee
+    ,   instance = this;
+    
+    // Not subclassing
+    if ( cls.caller !== Evt.Class.fabricate ) {
+        
+        cls.fire('create', instance, {
+            'instance' : instance,
+            'cls'      : cls,
+            'args'     : Y(arguments)
+        });
+        
+        if ( instance.init )
+            return instance.init.apply(instance, arguments);
+    }
+    
+    return instance;
+}
+
+
+/**
+ * Creates a new class. All classes inherit from Evt.Class, and therefore support
+ * metaprogramming hooks and mixins.
+ * 
+ * @param {String} className Name of the Class.
+ * 
+ * @param {Type} [Parent] Parent class for subclassing. If Parent is a subclass of Evt.Class
+ * itself, the new class will inherit directly from Parent. Otherwise, members will be
+ * copied off the prototype of Parent before applying any new instance members, but the
+ * new class will not respond to instanceof from Parent.
+ * 
+ * @param {Object} [members] Instance members to add to the new class's prototype; a class
+ * constructor can be supplied as `init`.
+ * 
+ * @returns {Class} A new Class.
+ */
+function Class(className, Parent, members){
+    var ClassFactory  = arguments.callee
+    ,   SuperClass = ClassFactory
+    ,   prototype  = this
+    ;
+    
+    if ( !members && !Y.isFunction(Parent) ) {
+        members = Parent;
+        Parent  = null;
+    }
+    members = members || {};
+    Parent  = Parent  || Object.getPrototypeOf(members).constructor;
+    if (Parent == ClassFactory) Parent = Object;
+    var parentMembers = Parent.prototype;
+    
+    if (Parent.prototype instanceof ClassFactory) {
+        SuperClass = Parent;
+        prototype  = Parent.fabricate();
+        parentMembers = {};
+    }
+    
+    if ( !(prototype instanceof ClassFactory) )
+        return new ClassFactory(Parent, members);
+    
+    // Creates a new function with the appropriate name
+    // based on the className.
+    var NewClass, 
+    constructor = [
+        'var '+className,
+        (''+_Class).replace('_Class', className),
+        'NewClass = '+className, ''
+    ].join(';\n');
+    eval(constructor);
+    NewClass.prototype.toString = function(){ return this.className+"()"; };
+    
+    // Copy Class statics
+    for (var k in ClassFactory) {
+        var v = ClassFactory[k];
+        if ( Y.isFunction(v) && !(k in Y.event.Emitter.methods) )
+            NewClass[k] = v;
+    }
+    
+    // Copy parent methods, then add new instance methods
+    for (var k in parentMembers)
+        prototype[k] = parentMembers[k];
+    for (var k in members)
+        prototype[k] = members[k];
+    
+    prototype.constructor = NewClass;
+    NewClass.prototype = prototype;
+    
+    // Fix Constructors
+    NewClass.constructor = SuperClass;
+    var init = prototype.init;
+    function initWrapper(){
+        var instance = this;
+        
+        if (init) {
+            var result = init.apply(instance, arguments);
+            if (result) instance = result;
+        }
+        
+        NewClass.fire('init', instance, {
+            'instance' : instance,
+            'cls'      : NewClass,
+            'args'     : Y(arguments)
+        });
+        
+        return instance;
+    }
+    initWrapper.__wraps__ = init;
+    NewClass.init = prototype.init = initWrapper;
+    
+    // Finalize
+    NewClass.className = prototype.className = className;
+    KNOWN_CLASSES[className] = NewClass;
+    
+    var ParentEmitter = (Parent.__emitter__ ? Parent : ClassFactory);
+    NewClass.__emitter__ = new Y.event.Emitter(NewClass, ParentEmitter);
+    
+    ParentEmitter.fire('subclass', 
+        NewClass, {
+            'className' : className,
+            'parent'    : Parent,
+            'child'     : NewClass,
+            'members'   : members
+        });
+    
+    return NewClass;
+}
+
+// Decorate with emitter methods
+Class.__emitter__ = new Y.event.Emitter(Class);
+
+Evt.Class = 
+Evt.subclass = Class;
+
+/* Class Methods */
+
+/**
+ * Create a new instance and run delegate constructor if it exists.
+ * Unlike the keyword `new`, instantiate can be applied.
+ */
+Class.instantiate = 
+function instantiate(){
+    var instance = this.fabricate();
+    if ( instance.init )
+        instance.init.apply(instance, arguments);
+    return instance;
+};
+    
+/**
+ * Create new instance, but do not run the delegate constructor.
+ */
+Class.fabricate = 
+function fabricate(){
+    var Cls = this;
+    return new Cls();
+};
+
+/**
+ * Class method of Classes, not to be confused with Evt.subclass, which is a static method.
+ */
+Class.subclass = 
+function subclass(className, members){
+    return new Class(className, this, members);
+};
+
+
+})();
\ No newline at end of file
diff --git a/src/evt/evt.js.php b/src/evt/evt.js.php
new file mode 100644
index 0000000..c4ee4a0
--- /dev/null
+++ b/src/evt/evt.js.php
@@ -0,0 +1,40 @@
+<?php
+function dump_file($path, $add_newline=true){
+    $size = filesize($path);
+    if ($size > 0) {
+        $f = fopen($path, "r");
+        echo fread($f, $size);
+        fclose($f);
+    }
+    if ($add_newline) echo "\n";
+}
+
+$js_files = array(
+    'evt.class'
+);
+
+function evt_js_list($path='') {
+    global $js_files;
+    $path = $path ? $path : dirname($_SERVER["REQUEST_URI"]);
+    // echo $path;
+    foreach ($js_files as $f) {
+        echo "<script src='$path/$f.js' type='text/javascript'></script>\n";
+    }
+}
+
+function evt_js_dump($expose=false) {
+    global $js_files;
+    if (!$expose)
+        echo "(function(){";
+    foreach ($js_files as $f)
+        dump_file("./$f.js");
+    if (!$expose)
+        echo "})();";
+}
+
+if ( basename($_SERVER["SCRIPT_FILENAME"]) == basename(__FILE__) ) {
+    if ( $_REQUEST["list"] )
+        evt_js_list();
+    else
+        evt_js_dump();
+}
\ No newline at end of file
diff --git a/src/portal/util/eventloop.js b/src/portal/util/eventloop.js
index 1e2febb..9a8bd27 100644
--- a/src/portal/util/eventloop.js
+++ b/src/portal/util/eventloop.js
@@ -44,6 +44,7 @@ methods = {
     
     reset : function(){
         this.stop();
+        this.elapsedAtStop = 0;
         this.ticks = 0;
         this.times = [];
         this.realtimes = [];
@@ -51,27 +52,42 @@ methods = {
     
     start : function(){
         if (this.running) return;
+        
         this.running = true;
-        this.now = new Date().getTime() - (1000/this.framerate);
+        this.now = new Date().getTime() - (this.elapsedAtStop || this.targetTime);
         this.fire('start');
-        this.tick();
+        
+        if (this.elapsedAtStop > 0)
+            this.sleepMinus(this.elapsedAtStop);
+        else
+            this.tick();
+        this.elapsedAtStop = 0;
     },
     
     stop : function(){
         if (!this.running) return;
         
         clearTimeout(this.timer);
+        this.elapsedAtStop = Math.min(this.targetTime, new Date().getTime() - this.now);
         this.timer = null;
         this.running = false;
         this.fire('stop');
     },
     
-    tick : function(){
-        var lastTick = this.now;
+    sleepMinus : function(tFrame){
+        if (this.timer !== null) return;
+        
+        var tickInt = Math.max(MIN_TICK_INTERVAL, this.targetTime - tFrame);
+        this.timer = setTimeout(this.tick, tickInt);
+    },
+    
+    tick : function(lastTick){
+        lastTick     = lastTick || this.now;
         this.now     = new Date().getTime();
         this.elapsed = this.now - lastTick;
         
         clearTimeout(this.timer);
+        this.timer = null;
         
         this.fire('tick', this, {
             now     : this.now,
@@ -79,10 +95,8 @@ methods = {
             ticks   : ++this.ticks
         });
         
-        var tFrame  = new Date().getTime() - this.now
-        ,   tickInt = Math.max(MIN_TICK_INTERVAL, this.targetTime - tFrame);
-        
-        this.timer = setTimeout(this.tick, tickInt);
+        var tFrame = this.tFrame = new Date().getTime() - this.now;
+        this.sleepMinus(tFrame);
         
         this.realtimes.push(tFrame);
         this.times.push(Math.max(tFrame, this.targetTime));
@@ -93,11 +107,11 @@ methods = {
     },
     
     fps : function(){
-        return 1000 / (this.times.reduce(add,0) / this.times.length);
+        return 1000 / (this.times.reduce(Y.op.add,0) / this.times.length);
     },
     
     frametime : function(){
-        return (this.realtimes.reduce(add,0) / this.realtimes.length);
+        return (this.realtimes.reduce(Y.op.add,0) / this.realtimes.length);
     }
     
 };
diff --git a/src/portal/util/fps.js b/src/portal/util/fps.js
new file mode 100644
index 0000000..c66cc33
--- /dev/null
+++ b/src/portal/util/fps.js
@@ -0,0 +1,99 @@
+FpsSparkline = new Y.Class('FpsSparkline', {
+    
+    init : function(loop, el, w,h, maxBuffer, interval){
+        this.buffer    = [];
+        
+        this.el        = el;
+        this.width     = w !== undefined ? w : 'auto';
+        this.height    = h !== undefined ? h : 'auto';
+        
+        // Wrap tick function to extract data
+        this.loop      = loop;
+        this.loopTick  = loop.tick;
+        loop.tick      = this.tickTime.bind(this);
+        
+        // Aggregation counters
+        this.ticks     = 0;
+        this.tickSum   = 0;
+        
+        this.maxBuffer = maxBuffer || 0; // intervals to show
+        this.interval  = interval  || loop.framerate; // ticks to aggregate into an interval
+        
+        $(this.setup.bind(this));
+    },
+    
+    setup : function(){
+        this.el = $(this.el);
+        
+        var w = this.el.parent().width();
+        if (this.width === 0)
+            this.width = w+'px';
+        if (this.height === 0)
+            this.height = this.el.height()+'px';
+        if (this.maxBuffer === 0)
+            this.maxBuffer = Math.floor(w / 3);
+    },
+    
+    tickTime : function(lastTick){
+        var loop = this.loop
+        ,   buf  = this.buffer
+        ;
+        this.loopTick.call(loop, lastTick);
+        
+        this.ticks++;
+        this.tickSum += loop.tFrame;
+        
+        if (this.ticks >= this.interval) {
+            buf.push( this.tickSum/this.ticks );
+            this.tickSum = this.ticks = 0;
+            if (buf.length > this.maxBuffer) buf.shift();
+        }
+    },
+    
+    /**
+     * Draws average render time across interval frames
+     */
+    drawTimes : function(){
+        var buf = this.buffer
+        ,   max = this.maxBuffer
+        ,   diff = max - buf.length
+        ;
+        
+        if (!buf.length) return;
+        
+        if (diff > 0) {
+            buf = buf.slice(0);
+            while (diff-- > 0) buf.push(null);
+        }
+        
+        this.el
+            .sparkline( buf,
+                { type             : 'line'
+                
+                , width            : this.width
+                , height           : this.height
+                
+                , lineColor        : '#333333'
+                , fillColor        : '#333333'
+                , spotColor        : false
+                , minSpotColor     : '#83BB32'
+                , maxSpotColor     : '#AF2A31'
+                
+                // , chartRangeMin    : 0
+                // , chartRangeMax    : 100
+                // , normalRangeColor : '#7F7F7F'
+                // , normalRangeMin   : 0
+                // , normalRangeMax   : this.loop.frametime
+                });
+    },
+    
+    /**
+     * Draws average FPS over interval.
+     */
+    drawFps : function(){
+        
+    }
+    
+    
+});
+
diff --git a/src/tanks/bullet/bullet.js b/src/tanks/bullet/bullet.js
new file mode 100644
index 0000000..ce139c9
--- /dev/null
+++ b/src/tanks/bullet/bullet.js
@@ -0,0 +1,5 @@
+Bullet = new Y.Class('Bullet', Thing, {
+    
+    
+    
+});
\ No newline at end of file
diff --git a/src/tanks/game/map.js b/src/tanks/game/map.js
index 96bd951..d70c4ae 100644
--- a/src/tanks/game/map.js
+++ b/src/tanks/game/map.js
@@ -36,13 +36,13 @@ Y(Game.prototype).extend({
     addBlocker : function(agent){
         var bb = agent.boundingBox;
         if (agent.blocking && bb)
-            agent.region = this.grid.set(bb.x1,bb.y1, bb.x2,bb.y2, agent);
+            agent.region = this.pathmap.set(bb.x1,bb.y1, bb.x2,bb.y2, agent);
         return agent;
     },
     
     removeBlocker : function(agent){
         if (agent.region)
-            this.grid.remove(agent.region);
+            this.pathmap.remove(agent.region);
         return agent;
     },
     
diff --git a/src/tanks/game/player.js b/src/tanks/game/player.js
index 8ce715d..810c0bb 100644
--- a/src/tanks/game/player.js
+++ b/src/tanks/game/player.js
@@ -33,14 +33,14 @@ Player = new Y.Class('Player', {
             .bind('mouseup',   this.mouseup);
     },
     
-    queueMove : function(dir){
-        var self = this;
-        return function(evt){
-            self.action = Actions.MOVE;
-            self.target = dir;
-            return false;
-        };
-    },
+    // queueMove : function(dir){
+    //     var self = this;
+    //     return function(evt){
+    //         self.action = Actions.MOVE;
+    //         self.target = dir;
+    //         return false;
+    //     };
+    // },
     
     updateMeta : function(evt){
         this.shift = evt.shiftKey;
diff --git a/src/tanks/ui.js b/src/tanks/ui.js
index 4d71fde..02bf453 100644
--- a/src/tanks/ui.js
+++ b/src/tanks/ui.js
@@ -1,12 +1,3 @@
-function toggleGame(evt){
-    if (LBT.loop.running)
-        LBT.stop();
-    else
-        LBT.start();
-    
-    updateInfo();
-    return false;
-}
 
 // Update performance info periodically
 function updateInfo(){
@@ -24,6 +15,18 @@ function updateInfo(){
     $('#info [name=units]').val( n_units );
     $('#info [name=bullets]').val( n_projs );
     
+    spark.drawTimes();
+    
+    return false;
+}
+
+function toggleGame(evt){
+    if (LBT.loop.running)
+        LBT.stop();
+    else
+        LBT.start();
+    
+    updateInfo();
     return false;
 }
 
@@ -41,13 +44,12 @@ function fixOverlayText(){
 
 
 jQuery(function($){
+    spark = new FpsSparkline(LBT.loop, '.fps-sparkline', 0,0);
+    
     // Tick once to draw grid, initial units
     LBT.start();
     LBT.stop();
     
-    // Add Buttons
-    // logger.menu.prepend('<a class="start_btn" />', ' | ', '<a class="overlay_btn"></a>', ' || ');
-    
     setInterval(updateInfo, 1000);
     updateInfo();
     
@@ -82,5 +84,4 @@ jQuery(function($){
         }
     });
     
-    // 
 });
\ No newline at end of file
diff --git a/src/tanks/unit/tank.js b/src/tanks/unit/tank.js
index 2790285..2ccd6fb 100644
--- a/src/tanks/unit/tank.js
+++ b/src/tanks/unit/tank.js
@@ -1,18 +1,9 @@
-(function(){
-var uid = 0;
 
-
-Tank = new Y.Class('Tank', {
+Tank = new Y.Class('Tank', Thing, {
     
-    init : function(align){
-        this.id    = uid++;
-        this.align = align || 0;
-        
-        this.bullets = new Y.YArray();
-        
-        this.fillStats();
-        this.createCooldowns();
-    },
+    // Bounding box size
+    width  : REF_SIZE*0.7,
+    height : REF_SIZE*0.6,
     
     // Attributes
     stats: {
@@ -24,50 +15,10 @@ Tank = new Y.Class('Tank', {
         shots     : 5    // max projectiles in the air at once
     },
     
-    // *** Bookkeeping *** //
     
-    id      : 0,
-    bullets : null,
-    align   : 0,
-    dead    : false,
-    
-    destroy : function(){
-        if (this.dead) return;
-        
-        this.dead = true;
-        this.fire('destroy', this);
-    },
-    
-    
-    loc : null,
-    boundingBox : null,
-    vec : 0,
-    
-    // Bounding box size
-    width  : REF_SIZE*0.7,
-    height : REF_SIZE*0.6,
-    
-    
-    setLocation : function(x,y){
-        var loc = this.loc;
-        if (loc && loc.x === x && loc.y === y)
-            return loc;
-        loc = this.loc = new Loc(x,y);
-        if (this.shape) this.shape.position(x,y);
-        this.boundingBox = new Loc.Rect(x,y, x+this.width,y+this.height);
-        return loc;
-    },
-    
-    // *** Gameplay Methods *** //
-    
-    fillStats : function(){
-        this.stats = Tank.fillStats(this.stats);
-    },
-    
-    createCooldowns : function(){
-        this.cooldowns = Y({
-            attack: new Cooldown(1000 * this.stats.speed)
-        });
+    init : function(align){
+        Thing.init.call(this, align);
+        this.bullets = new Y.YArray();
     },
     
     /**
@@ -154,45 +105,6 @@ Tank = new Y.Class('Tank', {
                 .appendTo( parent );
         
         return this;
-    },
-    
-    draw : function(){
-        if (this.dead) 
-            this.shape.hide();
-        else
-            this.shape.draw();
-    },
-    
-    toString : function(){
-        return this.className+'(id='+this.id+', loc='+this.loc+')';
     }
-});
-
-
-
-Y(Tank).extend({
     
-    fillStats : function(stats){
-        var st = Y(stats)
-        ,   stats = st.clone().end()
-        ;
-        
-        st.forEach(function(v, k){
-            var k = Y(k)
-            ,   k_ = k.rtrim('_max')
-            ;
-            
-            if ( k.endsWith('_max') ) {
-                if ( stats[k_] === undefined )
-                    stats[k_] = v;
-                
-            } else if ( stats[k+'_max'] === undefined )
-                stats[k+'_max'] = v;
-            
-        });
-        
-        return stats;
-    }
 });
-
-})();
diff --git a/src/tanks/unit/thing.js b/src/tanks/unit/thing.js
new file mode 100644
index 0000000..7eb317d
--- /dev/null
+++ b/src/tanks/unit/thing.js
@@ -0,0 +1,127 @@
+Thing = new Evt.Class('Thing', {
+    
+    init : function(align){
+        this.id    = Thing.THING_ID++;
+        this.align = align || 0;
+        
+        this.fillStats();
+        this.createCooldowns();
+    },
+    
+    stats: {
+        move      : 0.5, // move speed (squares/sec)
+        rotate    : HALF_PI, // rotation speed (radians/sec)
+        
+        power     : 1,   // attack power
+        speed     : 1.0, // attacks/sec
+        shots     : 5    // max projectiles in the air at once
+    },
+    
+    
+    
+    // *** Bookkeeping *** //
+    
+    id      : 0,
+    align   : 0,
+    dead    : false,
+    
+    loc : null,
+    boundingBox : null,
+    
+    // Rotation (rads)
+    vec : 0,
+    
+    // Bounding box dimensions
+    width  : REF_SIZE*0.7,
+    height : REF_SIZE*0.6,
+    
+    
+    destroy : function(){
+        if (this.dead) return;
+        
+        this.dead = true;
+        this.fire('destroy', this);
+    },
+    
+    setLocation : function(x,y){
+        var loc = this.loc;
+        if (loc && loc.x === x && loc.y === y)
+            return loc;
+        loc = this.loc = new Loc(x,y);
+        if (this.shape) this.shape.position(x,y);
+        this.boundingBox = new Loc.Rect(x,y, x+this.width,y+this.height);
+        return loc;
+    },
+    
+    
+    
+    
+    
+    // *** Gameplay Methods *** //
+    
+    fillStats : function(){
+        this.stats = Thing.fillStats(this.stats);
+    },
+    
+    createCooldowns : function(){
+        this.cooldowns = Y({
+            attack: new Cooldown(1000 * this.stats.speed)
+        });
+    },
+    
+    /**
+     * Determines what the creep should do -- move, attack, etc.
+     */
+    act : function(){
+        return this;
+    },
+    
+    
+    /// Rendering Methods ///
+    
+    /**
+     * Sets up unit appearance for minimal updates. Called once at start,
+     * or when the world needs to be redrawn from scratch.
+     */
+    render : function( parent ){
+        return this;
+    },
+    
+    draw : function(){
+        if (this.dead) 
+            this.shape.hide();
+        else
+            this.shape.draw();
+    },
+    
+    toString : function(){
+        return this.className+'(id='+this.id+', loc='+this.loc+')';
+    }
+    
+});
+
+Y(Thing).extend({
+    THING_ID : 0,
+    
+    fillStats : function(stats){
+        var st = Y(stats)
+        ,   stats = st.clone().end()
+        ;
+        
+        st.forEach(function(v, k){
+            var k = Y(k)
+            ,   k_ = k.rtrim('_max')
+            ;
+            
+            if ( k.endsWith('_max') ) {
+                if ( stats[k_] === undefined )
+                    stats[k_] = v;
+                
+            } else if ( stats[k+'_max'] === undefined )
+                stats[k+'_max'] = v;
+            
+        });
+        
+        return stats;
+    }
+});
-- 
1.7.0.4