diff --git a/index.js b/index.js
index aef2630..cee5b35 100644
--- a/index.js
+++ b/index.js
@@ -2,11 +2,17 @@ require('./main.css');
 require('jquery-ui/themes/base/core.css');
 require('jquery-ui/themes/base/menu.css');
 require('jquery-ui/themes/base/autocomplete.css');
+require('jquery-ui/themes/base/calendar.css');
+require('jquery-ui/themes/base/datepicker.css');
 require('jquery-ui/themes/base/theme.css');
 var $ = require('jquery');
-var autocomplete = require('jquery-ui/ui/widgets/autocomplete');
+var Autocomplete = require('jquery-ui/ui/widgets/autocomplete');
+var Datepicker = require('jquery-ui/ui/widgets/datepicker');
 
 $('<h1>Welcome to the programming languages quiz</h1>').appendTo('body');
-new autocomplete({
+new Autocomplete({
   source: ['javascript', 'css', 'c', 'objectivec']
 }).element.appendTo('body').focus();
+
+$('<h2>When do you want to start the quiz?</h2>').appendTo('body');
+new Datepicker({}).element.appendTo('body');
diff --git a/package.json b/package.json
index aea1f7a..e28557a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "webpack-dev-server --config webpack-config.js",
-    "build": "webpack --config webpack-config.js"
+    "build": "webpack --production --config webpack-config.js"
   },
   "keywords": [
     "jquery-ui",
@@ -18,15 +18,19 @@
   "author": "Jörn Zaefferer",
   "license": "MIT",
   "dependencies": {
+    "cldr-data": "^30.0.1",
+    "globalize": "^1.1.2",
     "jquery": "^2.1.4",
-    "jquery-ui": "1.12.x"
+    "jquery-ui": "github:jquery/jquery-ui#datepicker"
   },
   "devDependencies": {
     "clean-webpack-plugin": "^0.1.3",
     "css-loader": "^0.16.0",
     "extract-text-webpack-plugin": "^0.8.2",
     "file-loader": "^0.8.4",
+    "globalize-webpack-plugin": "^0.3.6",
     "html-webpack-plugin": "^1.6.1",
+    "nopt": "^3.0.6",
     "style-loader": "^0.12.3",
     "webpack": "^1.12.2",
     "webpack-dev-server": "^1.11.0"
diff --git a/webpack-config.js b/webpack-config.js
index f12147d..68e5741 100644
--- a/webpack-config.js
+++ b/webpack-config.js
@@ -1,20 +1,43 @@
+var webpack = require( "webpack" );
 var Clean = require('clean-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
+var CommonsChunkPlugin = require( 'webpack/lib/optimize/CommonsChunkPlugin' );
+var GlobalizePlugin = require('globalize-webpack-plugin');
+var nopt = require( "nopt" );
+
+var options = nopt({
+	production: Boolean
+});
 
 module.exports = {
-	entry: {
-		main: './index.js'
-	},
+	entry: options.production ?  {
+		main: './index.js',
+		vendor: [
+			'globalize',
+			'globalize/dist/globalize-runtime/number',
+			'globalize/dist/globalize-runtime/currency',
+			'globalize/dist/globalize-runtime/date',
+			'globalize/dist/globalize-runtime/message',
+			'globalize/dist/globalize-runtime/plural',
+			'globalize/dist/globalize-runtime/relative-time',
+			'globalize/dist/globalize-runtime/unit'
+		]
+	} : "./index.js",
+	debug: !options.production,
 	output: {
 		path: './dist',
-		filename: 'app.[hash].js'
+		filename: options.production ? 'app.[hash].js' : 'app.js'
+	},
+	externals: {
+		'globalize-locales': 'var {}',
+		'globalize/date': 'var {}'
 	},
 	module: {
 		loaders: [
 			{
 				test: /\.css$/,
-				loader: ExtractTextPlugin.extract("style-loader", "css-loader")
+				loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
 			},
 			{
 				test: /\.(jpg|png)$/,
@@ -24,9 +47,24 @@ module.exports = {
 	},
 	plugins: [
 		new Clean(['dist']),
-		new ExtractTextPlugin("app.[hash].css"),
+		new ExtractTextPlugin('app.[hash].css'),
+		new GlobalizePlugin({
+			production: options.production,
+			developmentLocale: 'de',
+			supportedLocales: [ 'de' ],
+			output: 'globalize-compiled-data-[locale].[hash].js'
+		}),
 		new HtmlWebpackPlugin({
+			production: options.production,
 			title: 'jQuery UI Autocomplete demo, built with webpack'
 		})
-	]
+	].concat( options.production ? [
+		new webpack.optimize.DedupePlugin(),
+		new CommonsChunkPlugin( "vendor", "vendor.[hash].js" ),
+		new webpack.optimize.UglifyJsPlugin({
+			compress: {
+				warnings: false
+			}
+		})
+	] : [] )
 };