diff --git a/package.json b/package.json
index 24e2eb18abb..78081c998b8 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "grunt-karma": "~0.8.3",
     "grunt-ng-annotate": "^0.9.2",
     "grunt-string-replace": "~0.2.4",
+    "grunt-typescript": "^0.7.0",
     "grunt-usemin": "3.0.0",
     "jshint-stylish": "~0.1.5",
     "karma": "~0.12.31",
diff --git a/public/app/components/panelmeta.d.ts b/public/app/components/panelmeta.d.ts
new file mode 100644
index 00000000000..42258894622
--- /dev/null
+++ b/public/app/components/panelmeta.d.ts
@@ -0,0 +1,7 @@
+/// <reference path="../headers/require.d.ts" />
+declare class Base {
+  constructor();
+  testFunc(): number
+  getName(): string
+}
+export = Base;
diff --git a/public/app/components/panelmeta.js b/public/app/components/panelmeta.js
index 7eee8fa970f..9f0b2cfcdd5 100644
--- a/public/app/components/panelmeta.js
+++ b/public/app/components/panelmeta.js
@@ -33,6 +33,10 @@ function () {
     this.menu.push({text: text, icon: icon, click: click, role: role});
   };
 
+  PanelMeta.prototype.getName = function() {
+    return "javascript";
+  };
+
   PanelMeta.prototype.addExtendedMenuItem = function(text, icon, click, role) {
     this.extendedMenu.push({text: text, icon: icon, click: click, role: role});
   };
diff --git a/public/app/controllers/grafanaCtrl.js b/public/app/controllers/grafanaCtrl.js
index 16e505a68dc..6576b57de87 100644
--- a/public/app/controllers/grafanaCtrl.js
+++ b/public/app/controllers/grafanaCtrl.js
@@ -4,10 +4,13 @@ define([
   'lodash',
   'jquery',
   'store',
+  './testCtrl',
 ],
-function (angular, config, _, $, store) {
+function (angular, config, _, $, store, TestCtrl) {
   "use strict";
 
+  console.log(new TestCtrl().getName());
+
   var module = angular.module('grafana.controllers');
 
   module.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, $rootScope, $controller, contextSrv) {
diff --git a/public/app/controllers/testCtrl.d.ts b/public/app/controllers/testCtrl.d.ts
new file mode 100644
index 00000000000..fd80685535d
--- /dev/null
+++ b/public/app/controllers/testCtrl.d.ts
@@ -0,0 +1,6 @@
+/// <reference path="../headers/require.d.ts" />
+declare class Base {
+    constructor();
+    getName(): string;
+}
+export = Base;
diff --git a/public/app/controllers/testCtrl.js b/public/app/controllers/testCtrl.js
new file mode 100644
index 00000000000..b8687f2732b
--- /dev/null
+++ b/public/app/controllers/testCtrl.js
@@ -0,0 +1,14 @@
+///<reference path="../headers/require.d.ts" />
+define(["require", "exports", "../components/panelmeta"], function (require, exports) {
+    var Base = (function () {
+        function Base() {
+        }
+        Base.prototype.getName = function () {
+            debugger;
+            return "asd";
+        };
+        return Base;
+    })();
+    return Base;
+});
+//# sourceMappingURL=testCtrl.js.map
\ No newline at end of file
diff --git a/public/app/controllers/testCtrl.js.map b/public/app/controllers/testCtrl.js.map
new file mode 100644
index 00000000000..f99ddeff0ce
--- /dev/null
+++ b/public/app/controllers/testCtrl.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"testCtrl.js","sourceRoot":"","sources":["testCtrl.ts"],"names":["Base","Base.constructor","Base.getName"],"mappings":"AAAA,+CAA+C;;IAM/C;QAEIA;QACAC,CAACA;QAEMD,sBAAOA,GAAdA;YACEE,QAAQA,CAACA;YACTA,MAAMA,CAACA,KAAKA,CAACA;QACfA,CAACA;QACLF,WAACA;IAADA,CAACA,AATD,IASC;IAEa,AAAd,OAAS,IAAI,CAAC"}
\ No newline at end of file
diff --git a/public/app/controllers/testCtrl.ts b/public/app/controllers/testCtrl.ts
new file mode 100644
index 00000000000..cf7f91289fa
--- /dev/null
+++ b/public/app/controllers/testCtrl.ts
@@ -0,0 +1,18 @@
+///<reference path="../headers/require.d.ts" />
+
+///<amd-dependency path="../components/panelmeta" />
+
+import PanelMeta = require('../components/panelmeta');
+
+class Base {
+
+    constructor() {
+    }
+
+    public getName() : string {
+      debugger;
+      return "asd";
+    }
+}
+
+export = Base;
diff --git a/public/app/headers/require.d.ts b/public/app/headers/require.d.ts
new file mode 100644
index 00000000000..c42a1bda101
--- /dev/null
+++ b/public/app/headers/require.d.ts
@@ -0,0 +1,369 @@
+// Type definitions for RequireJS 2.1.8
+// Project: http://requirejs.org/
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/*
+require-2.1.8.d.ts may be freely distributed under the MIT license.
+
+Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/require.d.ts
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+declare module 'module' {
+	var mod: {
+		config: () => any;
+		id: string;
+		uri: string;
+	}
+	export = mod;
+}
+
+interface RequireError extends Error {
+
+	/**
+	* The error ID that maps to an ID on a web page.
+	**/
+	requireType: string;
+
+	/**
+	* Required modules.
+	**/
+	requireModules: string[];
+
+	/**
+	* The original error, if there is one (might be null).
+	**/
+	originalError: Error;
+}
+
+interface RequireShim {
+
+	/**
+	* List of dependencies.
+	**/
+	deps?: string[];
+
+	/**
+	* Name the module will be exported as.
+	**/
+	exports?: string;
+
+	/**
+	* Initialize function with all dependcies passed in,
+	* if the function returns a value then that value is used
+	* as the module export value instead of the object
+	* found via the 'exports' string.
+	* @param dependencies
+	* @return
+	**/
+	init?: (...dependencies: any[]) => any;
+}
+
+interface RequireConfig {
+
+	// The root path to use for all module lookups.
+	baseUrl?: string;
+
+	// Path mappings for module names not found directly under
+	// baseUrl.
+	paths?: { [key: string]: any; };
+
+	// Dictionary of Shim's.
+	// does not cover case of key->string[]
+	shim?: { [key: string]: RequireShim; };
+
+	/**
+	* For the given module prefix, instead of loading the
+	* module with the given ID, substitude a different
+	* module ID.
+	*
+	* @example
+	* requirejs.config({
+	*	map: {
+	*		'some/newmodule': {
+	*			'foo': 'foo1.2'
+	*		},
+	*		'some/oldmodule': {
+	*			'foo': 'foo1.0'
+	*		}
+	*	}
+	* });
+	**/
+	map?: {
+		[id: string]: {
+			[id: string]: string;
+		};
+	};
+
+	/**
+	* AMD configurations, use module.config() to access in
+	* define() functions
+	**/
+	config?: { [id: string]: {}; };
+
+	/**
+	* Configures loading modules from CommonJS packages.
+	**/
+	packages?: {};
+
+	/**
+	* The number of seconds to wait before giving up on loading
+	* a script.  The default is 7 seconds.
+	**/
+	waitSeconds?: number;
+
+	/**
+	* A name to give to a loading context.  This allows require.js
+	* to load multiple versions of modules in a page, as long as
+	* each top-level require call specifies a unique context string.
+	**/
+	context?: string;
+
+	/**
+	* An array of dependencies to load.
+	**/
+	deps?: string[];
+
+	/**
+	* A function to pass to require that should be require after
+	* deps have been loaded.
+	* @param modules
+	**/
+	callback?: (...modules: any[]) => void;
+
+	/**
+	* If set to true, an error will be thrown if a script loads
+	* that does not call define() or have shim exports string
+	* value that can be checked.
+	**/
+	enforceDefine?: boolean;
+
+	/**
+	* If set to true, document.createElementNS() will be used
+	* to create script elements.
+	**/
+	xhtml?: boolean;
+
+	/**
+	* Extra query string arguments appended to URLs that RequireJS
+	* uses to fetch resources.  Most useful to cachce bust when
+	* the browser or server is not configured correcty.
+	*
+	* @example
+	* urlArgs: "bust= + (new Date()).getTime()
+	**/
+	urlArgs?: string;
+
+	/**
+	* Specify the value for the type="" attribute used for script
+	* tags inserted into the document by RequireJS.  Default is
+	* "text/javascript".  To use Firefox's JavasScript 1.8
+	* features, use "text/javascript;version=1.8".
+	**/
+	scriptType?: string;
+
+}
+
+// todo: not sure what to do with this guy
+interface RequireModule {
+
+	/**
+	*
+	**/
+	config(): {};
+
+}
+
+/**
+*
+**/
+interface RequireMap {
+
+	/**
+	*
+	**/
+	prefix: string;
+
+	/**
+	*
+	**/
+	name: string;
+
+	/**
+	*
+	**/
+	parentMap: RequireMap;
+
+	/**
+	*
+	**/
+	url: string;
+
+	/**
+	*
+	**/
+	originalName: string;
+
+	/**
+	*
+	**/
+	fullName: string;
+}
+
+interface Require {
+
+	/**
+	* Configure require.js
+	**/
+	config(config: RequireConfig): Require;
+
+	/**
+	* CommonJS require call
+	* @param module Module to load
+	* @return The loaded module
+	*/
+	(module: string): any;
+
+	/**
+	* Start the main app logic.
+	* Callback is optional.
+	* Can alternatively use deps and callback.
+	* @param modules Required modules to load.
+	**/
+	(modules: string[]): void;
+
+	/**
+	* @see Require()
+	* @param ready Called when required modules are ready.
+	**/
+	(modules: string[], ready: Function): void;
+
+	/**
+	* @see http://requirejs.org/docs/api.html#errbacks
+	* @param ready Called when required modules are ready.
+	**/
+	(modules: string[], ready: Function, errback: Function): void;
+
+	/**
+	* Generate URLs from require module
+	* @param module Module to URL
+	* @return URL string
+	**/
+	toUrl(module: string): string;
+
+	/**
+	* Returns true if the module has already been loaded and defined.
+	* @param module Module to check
+	**/
+	defined(module: string): boolean;
+
+	/**
+	* Returns true if the module has already been requested or is in the process of loading and should be available at some point.
+	* @param module Module to check
+	**/
+	specified(module: string): boolean;
+
+	/**
+	* On Error override
+	* @param err
+	**/
+	onError(err: RequireError, errback?: (err: RequireError) => void): void;
+
+	/**
+	* Undefine a module
+	* @param module Module to undefine.
+	**/
+	undef(module: string): void;
+
+	/**
+	* Semi-private function, overload in special instance of undef()
+	**/
+	onResourceLoad(context: Object, map: RequireMap, depArray: RequireMap[]): void;
+}
+
+interface RequireDefine {
+
+	/**
+	* Define Simple Name/Value Pairs
+	* @param config Dictionary of Named/Value pairs for the config.
+	**/
+	(config: { [key: string]: any; }): void;
+
+	/**
+	* Define function.
+	* @param func: The function module.
+	**/
+	(func: () => any): void;
+
+	/**
+	* Define function with dependencies.
+	* @param deps List of dependencies module IDs.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback param deps module dependencies
+	*	callback return module definition
+	**/
+    	(deps: string[], ready: Function): void;
+
+	/**
+	*  Define module with simplified CommonJS wrapper.
+	* @param ready
+	*	callback require requirejs instance
+	*	callback exports exports object
+	*	callback module module
+	*	callback return module definition
+	**/
+	(ready: (require: Require, exports: { [key: string]: any; }, module: RequireModule) => any): void;
+
+	/**
+	* Define a module with a name and dependencies.
+	* @param name The name of the module.
+	* @param deps List of dependencies module IDs.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback deps module dependencies
+	*	callback return module definition
+	**/
+	(name: string, deps: string[], ready: Function): void;
+
+	/**
+	* Define a module with a name.
+	* @param name The name of the module.
+	* @param ready Callback function when the dependencies are loaded.
+	*	callback return module definition
+	**/
+	(name: string, ready: Function): void;
+
+	/**
+	* Used to allow a clear indicator that a global define function (as needed for script src browser loading) conforms
+	* to the AMD API, any global define function SHOULD have a property called "amd" whose value is an object.
+	* This helps avoid conflict with any other existing JavaScript code that could have defined a define() function
+	* that does not conform to the AMD API.
+	* define.amd.jQuery is specific to jQuery and indicates that the loader is able to account for multiple version
+	* of jQuery being loaded simultaneously.
+	*/
+	amd: Object;
+}
+
+// Ambient declarations for 'require' and 'define'
+declare var requirejs: Require;
+declare var require: Require;
+declare var define: RequireDefine;
diff --git a/tasks/options/typescript.js b/tasks/options/typescript.js
new file mode 100644
index 00000000000..79251c77eb6
--- /dev/null
+++ b/tasks/options/typescript.js
@@ -0,0 +1,19 @@
+module.exports = function() {
+  'use strict';
+
+  return {
+    base: {
+      src: ['public/app/**/*.ts'],
+      dest: '',
+      options: {
+        module: 'amd', //or commonjs
+        target: 'es5', //or es3
+        keepDirectoryHierarchy: true,
+        declaration: true,
+        watch: true,
+        sourceMap: true,
+      }
+    }
+  };
+
+};