diff --git a/res/app/components/stf/settings/index.js b/res/app/components/stf/settings/index.js
index 7b9933be..d48edeb5 100644
--- a/res/app/components/stf/settings/index.js
+++ b/res/app/components/stf/settings/index.js
@@ -1,3 +1,4 @@
+require('localforage')
 require('angular-localForage')
 
 module.exports = angular.module('stf/settings', [
diff --git a/res/app/settings/language/index.js b/res/app/settings/language/index.js
index 8838d1b0..b94eebf0 100644
--- a/res/app/settings/language/index.js
+++ b/res/app/settings/language/index.js
@@ -1,9 +1,8 @@
 module.exports = angular.module('stf-ui-language', [
-//  require('stf/settings').name
+  require('stf/settings').name
 ])
   .run(["$templateCache", function($templateCache) {
-    $templateCache.put('language.jade', require('./language.jade'))
+    $templateCache.put('settings/language/language.jade', require('./language.jade'))
   }])
   .factory('LanguageService', require('./language-service'))
   .controller('LanguageCtrl', require('./language-controller'))
-  
\ No newline at end of file
diff --git a/res/app/settings/language/language-controller.js b/res/app/settings/language/language-controller.js
index 8d160716..aa00c687 100644
--- a/res/app/settings/language/language-controller.js
+++ b/res/app/settings/language/language-controller.js
@@ -1,14 +1,16 @@
-module.exports = function LanguageCtrl($scope, LanguageService, SettingsService) { //gettextCatalog,
+module.exports = function ($scope, LanguageService, SettingsService) { //gettextCatalog,
 //  SettingsService.sync($scope, 'Language', {
 //    language: LanguageService.detectedLanguage
 //  })
 
   //SettingsService.set('')
-  console.log('hey')
 
 
-  //SettingsService.set('valueCrazy', 35)
-  //SettingsService.set('valueCrazyNew', {one: 1, two: 35.3, three: '日本語', four: [1, 2, 3, 4]})
+  SettingsService.set('valueCrazy', 35)
+  SettingsService.set('valueCrazyNew', {one: 1, two: 35.3, three: '日本語', four: [1, 2, 3, 4]})
+
+
+
 
   //console.log('he')
   //console.log(SettingsService.get('valueCrazy'))
diff --git a/res/app/settings/language/language-service.js b/res/app/settings/language/language-service.js
index 4cd8a092..33d26ede 100644
--- a/res/app/settings/language/language-service.js
+++ b/res/app/settings/language/language-service.js
@@ -1,25 +1,23 @@
 //var _ = require('lodash')
 
 module.exports = function LanguageServiceFactory() {
-  alert('he')
-
-  var LanguageService = {}
-
-  LanguageService.supportedLanguages = [
-    {code: 'en', name: 'English'},
-    {code: 'ja', name: '日本語'}
-  ]
-
-  var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
-  var browserLanguage = browserLocale.substring(0, 2)
-  var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
-  var defaultLanguage = 'ja'
-  LanguageService.detectedLanguage = defaultLanguage
-  LanguageService.selectedLanguage = defaultLanguage
-
-  LanguageService.getSelectedLanguage = function () {
-    return LanguageService.selectedLanguage = defaultLanguage //WebStorage.get('Language.language') || defaultLanguage
-  }
-
-  return LanguageService
+//  var LanguageService = {}
+//
+//  LanguageService.supportedLanguages = [
+//    {code: 'en', name: 'English'},
+//    {code: 'ja', name: '日本語'}
+//  ]
+//
+//  var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
+//  var browserLanguage = browserLocale.substring(0, 2)
+//  var detectedLanguage = _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ? browserLanguage : 'en'
+//  var defaultLanguage = 'ja'
+//  LanguageService.detectedLanguage = defaultLanguage
+//  LanguageService.selectedLanguage = defaultLanguage
+//
+//  LanguageService.getSelectedLanguage = function () {
+//    return LanguageService.selectedLanguage = defaultLanguage //WebStorage.get('Language.language') || defaultLanguage
+//  }
+//
+//  return LanguageService
 }
diff --git a/res/app/settings/language/language.jade b/res/app/settings/language/language.jade
index dad6be6d..051531ea 100644
--- a/res/app/settings/language/language.jade
+++ b/res/app/settings/language/language.jade
@@ -1,4 +1,4 @@
-.widget-container.fluid-height
+.widget-container.fluid-height(ng-controller='LanguageCtrl')
   .heading
     i.fa.fa-flag
     span(translate) Language
diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.jade
index 2cccb5ea..97cd494f 100644
--- a/res/app/settings/settings.jade
+++ b/res/app/settings/settings.jade
@@ -10,7 +10,7 @@ div(pane='center')
             i.fa.fa-trash-o
             span(translate) Reset Settings
     .col-md-4
-      div(ng-include='"language.jade"')
+      div(ng-include='"settings/language/language.jade"')
     .col-md-4
       .widget-container.fluid-height
         .heading
diff --git a/webpack.config.js b/webpack.config.js
index 2cc4b4bf..ea03dad2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,6 +18,7 @@ module.exports = {
       './node_modules'
     ],
     alias: {
+      'localforage': 'localforage/dist/localforage.js',
       'socket.io': 'socket.io-client/dist/socket.io',
       'oboe': 'oboe/dist/oboe-browser'
     }
@@ -37,7 +38,8 @@ module.exports = {
       { test: /\.html/, loader: 'html-loader' },
       { test: /angular\.js/, loader: 'exports?angular'},
       { test: /angular-route\.js/, loader: 'imports?angular=angular'},
-      { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}
+      { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'},
+      { test: /localforage\.js/, loader: 'script'}
     ],
     noParse: [
       //  pathutil.resource('bower_components')
@@ -46,7 +48,10 @@ module.exports = {
   plugins: [
     new webpack.ResolverPlugin(
       new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main'])
-    )
+    ),
+//    new webpack.ResolverPlugin(
+//      new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('package.json', ['main'])
+//    )
 //    ,new webpack.optimize.UglifyJsPlugin({mangle: false})
   ]
 }