diff --git a/app/lib/world/thang.coffee b/app/lib/world/thang.coffee
index 41544cbca..426e7541f 100644
--- a/app/lib/world/thang.coffee
+++ b/app/lib/world/thang.coffee
@@ -38,7 +38,7 @@ module.exports = class Thang
   publishNote: (channel, event) ->
     event.thang = @
     @world.publishNote channel, event
-    
+
   setGoalState: (goalID, status) ->
     @world.setGoalState goalID, status
 
diff --git a/app/lib/world/thang_state.coffee b/app/lib/world/thang_state.coffee
index 7ea6a9687..655f41b01 100644
--- a/app/lib/world/thang_state.coffee
+++ b/app/lib/world/thang_state.coffee
@@ -98,10 +98,14 @@ module.exports = class ThangState
         storage = @trackedPropertyValues[propIndex]
         value = @getStoredProp propIndex, type, storage
       if prop is "pos"
-        @thang.pos = @thang.pos.copy()
-        @thang.pos.x = inverse * @thang.pos.x + ratio * value.x
-        @thang.pos.y = inverse * @thang.pos.y + ratio * value.y
-        @thang.pos.z = inverse * @thang.pos.z + ratio * value.z
+        if @thang.pos.distanceSquared(value) > 900
+          # Don't interpolate; it was probably a teleport. https://github.com/codecombat/codecombat/issues/738
+          @thang.pos = value
+        else
+          @thang.pos = @thang.pos.copy()
+          @thang.pos.x = inverse * @thang.pos.x + ratio * value.x
+          @thang.pos.y = inverse * @thang.pos.y + ratio * value.y
+          @thang.pos.z = inverse * @thang.pos.z + ratio * value.z
       else if prop is "rotation"
         @thang.rotation = inverse * @thang.rotation + ratio * value
       @thang.partialState = true
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 6e3aebf3e..7d35d42aa 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -12,6 +12,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     manual: "Manual"
     fork: "Fork"
     play: "Play"
+    retry: "Retry"
 
   units:
     second: "second"
@@ -602,3 +603,27 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     tutorial: "tutorial"
     new_to_programming: ". New to programming? Hit our beginner campaign to skill up."
     so_ready: "I Am So Ready for This"
+
+  loading_error:
+    could_not_load: "Error loading from server"
+    connection_failure: "Connection failed."
+    unauthorized: "You need to be signed in. Do you have cookies disabled?"
+    forbidden: "You do not have the permissions."
+    not_found: "Not found."
+    not_allowed: "Method not allowed."
+    timeout: "Server timeout."
+    conflict: "Resource conflict."
+    bad_input: "Bad input."
+    server_error: "Server error."
+    unknown: "Unknown error."
+    
+  resources:
+    your_sessions: "Your Sessions"
+    level: "Level"
+    social_network_apis: "Social Network APIs"
+    facebook_status: "Facebook Status"
+    facebook_friends: "Facebook Friends"
+    facebook_friend_sessions: "Facebook Friend Sessions"
+    gplus_friends: "G+ Friends"
+    gplus_friend_sessions: "G+ Friend Sessions"
+    leaderboard: 'leaderboard'
\ No newline at end of file
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index fa6622d88..9111150f1 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -5,7 +5,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     sending: "Enviando..."
     cancel: "Cancelar"
     save: "Guardar"
-#    create: "Create"
+    create: "Crear"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -13,13 +13,13 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     fork: "Bifurcar"
     play: "Jugar"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "segundo"
+    seconds: "segundos"
+    minute: "minuto"
+    minutes: "minutos"
+    hour: "hora"
+    hours: "horas"
 
   modal:
     close: "Cerrar"
@@ -53,7 +53,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
   login:
     sign_up: "Crear una cuenta"
     log_in: "Entrar"
-#    logging_in: "Logging In"
+    logging_in: "Entrando..."
     log_out: "Salir"
     recover: "recuperar cuenta"
 
@@ -76,12 +76,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     no_ie: "CodeCombat no funciona en Internet Explorer 9 o anteriores. ¡Lo sentimos!"
     no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y puede que no funcione!"
     play: "Jugar"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
-#    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+    old_browser: "Ay, su navegador es demasiado viejo para ejecutar CodeCombat. ¡Lo sentimos!"
+    old_browser_suffix: "Puede tentar de todos modos, pero probablemente no va a funcionar."
+    campaign: "Campaña"
+    for_beginners: "Para principiantes"
+    multiplayer: "Multijugador"
+    for_developers: "Para programadores"
 
   play:
     choose_your_level: "Elige tu nivel"
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index 09d9b2ac1..1e350d8e1 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -5,7 +5,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     sending: "Enviando..."
     cancel: "Cancelar"
     save: "Salvar"
-#    create: "Create"
+    create: "Criar"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -13,13 +13,13 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     fork: "Fork"
     play: "Jogar"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  unidades:
+    second: "segundo"
+    seconds: "segundos"
+    minute: "minuto"
+    minutes: "minutos"
+    hour: "hora"
+    hours: "horas"
 
   modal:
     close: "Fechar"
@@ -53,7 +53,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
   login:
     sign_up: "Criar conta"
     log_in: "Entrar"
-#    logging_in: "Logging In"
+    logging_in: "Entrando"
     log_out: "Sair"
     recover: "Recuperar sua conta"
 
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 6fe1819ef..d32ba3c6d 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -5,7 +5,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     sending: "Se trimite..."
     cancel: "Anulează"
     save: "Salvează"
-#    create: "Create"
+    create: "Crează"
     delay_1_sec: "1 secundă"
     delay_3_sec: "3 secunde"
     delay_5_sec: "5 secunde"
@@ -13,13 +13,13 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     fork: "Fork"
     play: "Joacă"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "secundă"
+    seconds: "secunde"
+    minute: "minut"
+    minutes: "minute"
+    hour: "oră"
+    hours: "ore"
 
   modal:
     close: "Inchide"
@@ -53,7 +53,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
   login:
     sign_up: "Crează cont"
     log_in: "Log In"
-#    logging_in: "Logging In"
+    logging_in: "Se conectează"
     log_out: "Log Out"
     recover: "recuperează cont"
 
@@ -226,8 +226,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     skip_tutorial: "Sari peste (esc)"
     editor_config: "Editor Config"
     editor_config_title: "Configurare Editor"
-#    editor_config_language_label: "Programming Language"
-#    editor_config_language_description: "Define the programming language you want to code in."
+    editor_config_language_label: "Limbaj de Programare"
+    editor_config_language_description: "Definește limbajul de programare în care vrei să codezi."
     editor_config_keybindings_label: "Mapare taste"
     editor_config_keybindings_default: "Default (Ace)"
     editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite."
@@ -246,17 +246,17 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     tip_beta_launch: "CodeCombat a fost lansat beta in Octombrie 2013."
     tip_js_beginning: "JavaScript este doar începutul."
     tip_autocast_setting: "Ajutează setările de autocast apăsând pe rotița de pe buton."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
-#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
-#    tip_forums: "Head over to the forums and tell us what you think!"
+    think_solution: "Gândește-te la soluție, nu la problemă."
+    tip_theory_practice: "Teoretic nu este nici o diferență înte teorie și practică. Dar practic este. - Yogi Berra"
+    tip_error_free: "Există doar două metode de a scrie un program fără erori; numai a treia funcționează. - Alan Perlis"
+    tip_debugging_program: "Dacă a face debuggin este procesul de a scoate bug-uri, atunci a programa este procesul de a introduce bug-uri. - Edsger W. Dijkstra"
+    tip_forums: "Intră pe forum și spune-ți părerea!"
     tip_baby_coders: "În vitor până și bebelușii vor fi Archmage."
     tip_morale_improves: "Se va încărca până până când va crește moralul."
     tip_all_species: "Noi credem în șanse egale de a învăța programare pentru toate speciile."
-#    tip_reticulating: "Reticulating spines."
+    tip_reticulating: "Reticulating spines."
     tip_harry: "Ha un Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+    tip_great_responsibility: "With great coding skill comes great debug responsibility."
 #    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
 #    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
 #    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
@@ -587,16 +587,16 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     warmup: "Încălzire"
     vs: "VS"
 
-#  multiplayer_launch:
-#    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "The new way to compete with code."
-#    to_battle: "To Battle, Developers!"
-#    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
-#    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."
-#    ladder_explanation: "Choose your heroes, enchant your human or ogre armies, and climb your way over defeated fellow Wizards to reach the top of the ladders–then challenge your friends in our glorious, asynchronous multiplayer coding arenas. If you're feeling creative, you can even"
-#    fork_our_arenas: "fork our arenas"
-#    create_worlds: "and create your own worlds."
-#    javascript_rusty: "JavaScript a bit rusty? Don't worry; there's a"
-#    tutorial: "tutorial"
-#    new_to_programming: ". New to programming? Hit our beginner campaign to skill up."
-#    so_ready: "I Am So Ready for This"
+  multiplayer_launch:
+    introducing_dungeon_arena: "Prezentăm Dungeon Arena"
+    new_way: "Noul mod de a concura prin linii de cod."
+    to_battle: "La luptă, Developers!"
+    modern_day_sorcerer: "Știi să programezie? Tare. Ești un vrăjitor al noii ere! Nu crezi ca este timpul să îți folosești puterile de programare pentru a conduce în lupte epice minionii tăi? Și nu vorbim despre roboți aici."
+    arenas_are_here: "Arenele CodeCombat multiplayer 1v1 sunt aici."
+    ladder_explanation: "Alegeți eroii,vrăjește armatele de orci sau oameni, și croiește-ți drumul luptând și învingând alți Vrăjitori pentru a ajunge în topul clasamentului. Dacă te simți creativ poți chiar să"
+    fork_our_arenas: "să dai fork la arenele noastre"
+    create_worlds: "și să îți creezi propriile lumi."
+    javascript_rusty: "N-ai mai pus mâna pe JavaScript? Nicio problemă; există un"
+    tutorial: "tutorial"
+    new_to_programming: ". Nou in tainele programării? Încearcă campania de începători pentru ați dezolvata abilitățile."
+    so_ready: "Sunt atât de pregătit pentru asta!"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 5f77ea288..bbe0667c3 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -226,8 +226,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     skip_tutorial: "Пропуск (Esc)"
     editor_config: "Настройки редактора"
     editor_config_title: "Настройки редактора"
-#    editor_config_language_label: "Programming Language"
-#    editor_config_language_description: "Define the programming language you want to code in."
+    editor_config_language_label: "Язык программирования"
+    editor_config_language_description: "Определяет язык, на котором вы хотите программировать."
     editor_config_keybindings_label: "Сочетания клавиш"
     editor_config_keybindings_default: "По умолчанию (Ace)"
     editor_config_keybindings_description: "Добавляет дополнительные сочетания, известные из популярных редакторов."
@@ -264,8 +264,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_patience: "Терпением ты обладать должен, юный падаван. - Yoda"
     tip_documented_bug: "Документированный баг не является багом; это фича."
     tip_impossible: "Это всегда кажется невозможным, пока не сделано. - Nelson Mandela"
-#    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
-#    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
+    tip_talk_is_cheap: "Слова ничего не стоят. Покажи мне код. - Linus Torvalds"
+    tip_first_language: "Наиболее катастрофическая вещь, которую вы можете выучить - ваш первый язык программирования. - Alan Kay"
     time_current: "Текущее:"
     time_total: "Максимальное:"
     time_goto: "Перейти на:"
diff --git a/app/styles/base.sass b/app/styles/base.sass
index f5da8ee00..30980c1fb 100644
--- a/app/styles/base.sass
+++ b/app/styles/base.sass
@@ -167,7 +167,15 @@ a[data-toggle="modal"]
     width: 50%
     margin: 0 25%
   .progress-bar
-    width: 100%
+    width: 0%
+    transition: width 0.1s ease
+    
+  .errors .alert
+    padding: 5px
+    display: block
+    margin: 10px auto
+    .btn
+      margin-left: 10px
   
 .modal
   .wait
@@ -224,4 +232,4 @@ body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='
   .share-buttons
     margin-bottom: 20px
   .partner-badges
-    display: none
\ No newline at end of file
+    display: none
diff --git a/app/styles/play/ladder/ladder_tab.sass b/app/styles/play/ladder/ladder_tab.sass
index d4878511a..6d65cc5a6 100644
--- a/app/styles/play/ladder/ladder_tab.sass
+++ b/app/styles/play/ladder/ladder_tab.sass
@@ -3,4 +3,40 @@
     max-width: 150px
     white-space: nowrap
     overflow: hidden
-    text-overflow: ellipsis
\ No newline at end of file
+    text-overflow: ellipsis
+    
+  .bar rect
+    fill: steelblue
+    shape-rendering: crispEdges
+    
+  .bar text
+    fill: #fff
+    
+  .specialbar rect
+    fill: #555555
+    
+    
+  .axis path, .axis line
+    fill: none
+    stroke: #555555
+    shape-rendering: crispEdges
+    
+  .humans-bar
+    fill: #bf3f3f
+    shape-rendering: crispEdges
+  .ogres-bar
+    fill: #3f44bf
+    shape-rendering: crispEdges
+  text
+    fill: #555555
+    
+  .rank-text
+    font-size: 15px
+    fill: #555555
+    
+  .humans-rank-text
+    fill: #bf3f3f
+    
+  .ogres-rank-text
+    fill: #3f44bf
+    
\ No newline at end of file
diff --git a/app/styles/play/ladder/my_matches_tab.sass b/app/styles/play/ladder/my_matches_tab.sass
index 3483dcf38..a68f12225 100644
--- a/app/styles/play/ladder/my_matches_tab.sass
+++ b/app/styles/play/ladder/my_matches_tab.sass
@@ -1,7 +1,7 @@
 #my-matches-tab-view
   .axis path, .axis line
     fill: none
-    stroke: #000
+    stroke: #555
     shape-rendering: crispEdges
   .x.axis.path
     display: none
@@ -10,4 +10,20 @@
     fill: none
     stroke: steelblue
     stroke-width: 1.5px
+    
+  .humans-line
+    fill: none
+    stroke: #bf3f3f
+    stroke-width: 1.5px
+   
+  .ogres-line
+    fill: none
+    stroke: #3f44bf
+    stroke-width: 1.5px
 
+  .axis text
+    stroke: none
+    fill: #555555
+    shape-rendering: crispEdges
+    
+    
\ No newline at end of file
diff --git a/app/templates/account/profile.jade b/app/templates/account/profile.jade
index 7cd6d0750..65dc9786b 100644
--- a/app/templates/account/profile.jade
+++ b/app/templates/account/profile.jade
@@ -16,7 +16,7 @@ block content
     else
       span(data-i18n="account_profile.profile") Profile
 
-  if loading
+  if loadingProfile
     p(data-i18n="common.loading") Loading...
 
   else if !user.get('emailHash')
diff --git a/app/templates/loading.jade b/app/templates/loading.jade
index 519808a00..df2fc0eb5 100644
--- a/app/templates/loading.jade
+++ b/app/templates/loading.jade
@@ -1,4 +1,6 @@
 .loading-screen
   h1(data-i18n="common.loading") Loading...
-  .progress.progress-striped.active
-    .progress-bar
\ No newline at end of file
+  .progress
+    .progress-bar
+      
+  .errors
\ No newline at end of file
diff --git a/app/templates/loading_error.jade b/app/templates/loading_error.jade
new file mode 100644
index 000000000..b56ede4ac
--- /dev/null
+++ b/app/templates/loading_error.jade
@@ -0,0 +1,31 @@
+.alert.alert-danger.loading-error-alert
+  span(data-i18n="loading_error.could_not_load") Error loading from server
+  span  (
+  span(data-i18n="resources.#{name}")
+  span ) 
+  if !responseText
+    strong(data-i18n="loading_error.connection_failure") Connection failed.
+  else if status === 401
+    strong(data-i18n="loading_error.unauthorized") You need to be signed in. Do you have cookies disabled?
+  else if status === 403
+    strong(data-i18n="loading_error.forbidden") You do not have the permissions.
+  else if status === 404
+    strong(data-i18n="loading_error.not_found") Not found.
+  else if status === 405
+    strong(data-i18n="loading_error.not_allowed") Method not allowed.
+  else if status === 408
+    strong(data-i18n="loading_error.timeout") Server timeout.
+  else if status === 409
+    strong(data-i18n="loading_error.conflict") Resource conflict.
+  else if status === 422
+    strong(data-i18n="loading_error.bad_input") Bad input.
+  else if status >= 500
+    strong(data-i18n="loading_error.server_error") Server error.
+  else
+    strong(data-i18n="loading_error.unknown") Unknown error.
+
+  if resourceIndex !== undefined
+    button.btn.btn-sm.retry-loading-resource(data-i18n="common.retry", data-resource-index=resourceIndex) Retry
+  if requestIndex !== undefined
+    button.btn.btn-sm.retry-loading-request(data-i18n="common.retry", data-request-index=requestIndex) Retry
+    
\ No newline at end of file
diff --git a/app/views/account/profile_view.coffee b/app/views/account/profile_view.coffee
index 32faec138..f61f7f1e2 100644
--- a/app/views/account/profile_view.coffee
+++ b/app/views/account/profile_view.coffee
@@ -5,21 +5,21 @@ User = require 'models/User'
 module.exports = class ProfileView extends View
   id: "profile-view"
   template: template
-  loading: true
+  loadingProfile: true
 
   constructor: (options, @userID) ->
     super options
     @user = User.getByID(@userID)
-    @loading = false if 'gravatarProfile' of @user
+    @loadingProfile = false if 'gravatarProfile' of @user
     @listenTo(@user, 'change', @userChanged)
     @listenTo(@user, 'error', @userError)
 
   userChanged: (user) ->
-    @loading = false if 'gravatarProfile' of user
+    @loadingProfile = false if 'gravatarProfile' of user
     @render()
 
   userError: (user) ->
-    @loading = false
+    @loadingProfile = false
     @render()
 
   getRenderData: ->
@@ -28,7 +28,7 @@ module.exports = class ProfileView extends View
     grav = grav.entry[0] if grav
     addedContext =
       user: @user
-      loading: @loading
+      loadingProfile: @loadingProfile
       myProfile: @user.id is context.me.id
       grav: grav
       photoURL: @user.getPhotoURL()
diff --git a/app/views/kinds/CocoView.coffee b/app/views/kinds/CocoView.coffee
index ed81e4a20..768072a26 100644
--- a/app/views/kinds/CocoView.coffee
+++ b/app/views/kinds/CocoView.coffee
@@ -2,6 +2,7 @@ SuperModel = require 'models/SuperModel'
 utils = require 'lib/utils'
 CocoClass = require 'lib/CocoClass'
 loadingScreenTemplate = require 'templates/loading'
+loadingErrorTemplate = require 'templates/loading_error'
 
 visibleModal = null
 waitingModal = null
@@ -18,13 +19,26 @@ module.exports = class CocoView extends Backbone.View
     'click a': 'toggleModal'
     'click button': 'toggleModal'
     'click li': 'toggleModal'
+    'click .retry-loading-resource': 'onRetryResource'
+    'click .retry-loading-request': 'onRetryRequest'
 
   subscriptions: {}
   shortcuts: {}
 
+  # load progress properties
+  loadProgress:
+    num: 0
+    denom: 0
+    showing: false
+    resources: [] # models and collections
+    requests: [] # jqxhr's
+    somethings: [] # everything else
+    progress: 0
+
   # Setup, Teardown
 
   constructor: (options) ->
+    @loadProgress = _.cloneDeep @loadProgress
     @supermodel ?= options?.supermodel or new SuperModel()
     @options = options
     @subscriptions = utils.combineAncestralObject(@, 'subscriptions')
@@ -33,6 +47,7 @@ module.exports = class CocoView extends Backbone.View
     @shortcuts = utils.combineAncestralObject(@, 'shortcuts')
     @subviews = {}
     @listenToShortcuts()
+    @updateProgressBar = _.debounce @updateProgressBar, 100
     # Backbone.Mediator handles subscription setup/teardown automatically
     super options
 
@@ -74,7 +89,7 @@ module.exports = class CocoView extends Backbone.View
     return @template if _.isString(@template)
     @$el.html @template(@getRenderData())
     @afterRender()
-    @showLoading() if @startsLoading
+    @showLoading() if @startsLoading or @loading() # TODO: Remove startsLoading entirely
     @$el.i18n()
     @
 
@@ -89,6 +104,101 @@ module.exports = class CocoView extends Backbone.View
     context
 
   afterRender: ->
+    
+  # Resource and request loading management for any given view
+    
+  addResourceToLoad: (modelOrCollection, name, value=1) ->
+    @loadProgress.resources.push {resource:modelOrCollection, value:value, name:name}
+    @listenToOnce modelOrCollection, 'sync', @updateProgress
+    @listenTo modelOrCollection, 'error', @onResourceLoadFailed
+    @updateProgress()
+    
+  addRequestToLoad: (jqxhr, name, retryFunc, value=1) ->
+    @loadProgress.requests.push {request:jqxhr, value:value, name: name, retryFunc: retryFunc}
+    jqxhr.done @updateProgress
+    jqxhr.fail @onRequestLoadFailed
+
+  addSomethingToLoad: (name, value=1) ->
+    @loadProgress.somethings.push {loaded: false, name: name, value: value}
+    @updateProgress()
+
+  somethingLoaded: (name) ->
+    r = _.find @loadProgress.somethings, {name: name}
+    return console.error 'Could not find something called', name if not r
+    r.loaded = true
+    @updateProgress(name)
+
+  loading: ->
+    return false if @loaded
+    for r in @loadProgress.resources
+      return true if not r.resource.loaded
+    for r in @loadProgress.requests
+      return true if not r.request.status
+    for r in @loadProgress.somethings
+      return true if not r.loaded
+    return false
+
+  updateProgress: =>
+    console.debug 'Loaded', r.name if arguments[0] and r = _.find @loadProgress.resources, {resource:arguments[0]}
+    console.debug 'Loaded', r.name if arguments[2] and r = _.find @loadProgress.requests, {request:arguments[2]}
+    console.debug 'Loaded', r.name if arguments[0] and r = _.find @loadProgress.somethings, {name:arguments[0]}
+
+    denom = 0
+    denom += r.value for r in @loadProgress.resources
+    denom += r.value for r in @loadProgress.requests
+    denom += r.value for r in @loadProgress.somethings
+    num = @loadProgress.num
+    num += r.value for r in @loadProgress.resources when r.resource.loaded
+    num += r.value for r in @loadProgress.requests when r.request.status
+    num += r.value for r in @loadProgress.somethings when r.loaded
+    #console.log 'update progress', @, num, denom, arguments
+    
+    progress = if denom then num / denom else 0
+    # sometimes the denominator isn't known from the outset, so make sure the overall progress only goes up
+    @loadProgress.progress = progress if progress > @loadProgress.progress
+    @updateProgressBar()
+    if num is denom and not @loaded
+      @loaded = true
+      @onLoaded()
+      
+  updateProgressBar: =>
+    prog = "#{parseInt(@loadProgress.progress*100)}%"
+    @$el.find('.loading-screen .progress-bar').css('width', prog)
+
+  onLoaded: ->
+    @render()
+
+  # Error handling for loading
+  
+  onResourceLoadFailed: (resource, jqxhr) ->
+    for r, index in @loadProgress.resources
+      break if r.resource is resource
+    @$el.find('.loading-screen .errors').append(loadingErrorTemplate({
+      status:jqxhr.status,
+      name: r.name
+      resourceIndex: index,
+      responseText: jqxhr.responseText
+    })).i18n()
+  
+  onRetryResource: (e) ->
+    r = @loadProgress.resources[$(e.target).data('resource-index')]
+    r.resource.fetch()
+    $(e.target).closest('.loading-error-alert').remove()
+    
+  onRequestLoadFailed: (jqxhr) =>
+    for r, index in @loadProgress.requests
+      break if r.request is jqxhr
+    @$el.find('.loading-screen .errors').append(loadingErrorTemplate({
+      status:jqxhr.status,
+      name: r.name
+      requestIndex: index,
+      responseText: jqxhr.responseText
+    }))
+    
+  onRetryRequest: (e) ->
+    r = @loadProgress.requests[$(e.target).data('request-index')]
+    @[r.retryFunc]?()
+    $(e.target).closest('.loading-error-alert').remove()
 
   # Modals
 
diff --git a/app/views/play/ladder/ladder_tab.coffee b/app/views/play/ladder/ladder_tab.coffee
index db4eff8ad..b9fddcf38 100644
--- a/app/views/play/ladder/ladder_tab.coffee
+++ b/app/views/play/ladder/ladder_tab.coffee
@@ -1,4 +1,5 @@
 CocoView = require 'views/kinds/CocoView'
+CocoClass = require 'lib/CocoClass'
 Level = require 'models/Level'
 LevelSession = require 'models/LevelSession'
 CocoCollection = require 'models/CocoCollection'
@@ -18,7 +19,6 @@ class LevelSessionsCollection extends CocoCollection
 module.exports = class LadderTabView extends CocoView
   id: 'ladder-tab-view'
   template: require 'templates/play/ladder/ladder_tab'
-  startsLoading: true
 
   events:
     'click .connect-facebook': 'onConnectFacebook'
@@ -32,6 +32,7 @@ module.exports = class LadderTabView extends CocoView
 
   constructor: (options, @level, @sessions) ->
     super(options)
+    @addSomethingToLoad("social_network_apis")
     @teams = teamDataFromLevel @level
     @leaderboards = {}
     @refreshLadder()
@@ -40,17 +41,18 @@ module.exports = class LadderTabView extends CocoView
   checkFriends: ->
     return if @checked or (not window.FB) or (not window.gapi)
     @checked = true
-
-    @loadingFacebookFriends = true
+    
+    @addSomethingToLoad("facebook_status")
     FB.getLoginStatus (response) =>
       @facebookStatus = response.status
-      if @facebookStatus is 'connected' then @loadFacebookFriendSessions() else @loadingFacebookFriends = false
+      @loadFacebookFriends() if @facebookStatus is 'connected'
+      @somethingLoaded("facebook_status")
 
     if application.gplusHandler.loggedIn is undefined
-      @loadingGPlusFriends = true
       @listenToOnce(application.gplusHandler, 'checked-state', @gplusSessionStateLoaded)
     else
       @gplusSessionStateLoaded()
+    @somethingLoaded("social_network_apis")
 
   # FACEBOOK
 
@@ -60,16 +62,24 @@ module.exports = class LadderTabView extends CocoView
 
   onConnectedWithFacebook: -> location.reload() if @connecting
 
+  loadFacebookFriends: ->
+    @addSomethingToLoad("facebook_friends")
+    FB.api '/me/friends', @onFacebookFriendsLoaded
+    
+  onFacebookFriendsLoaded: (response) =>
+    @facebookData = response.data
+    @loadFacebookFriendSessions()
+    @somethingLoaded("facebook_friends")
+
   loadFacebookFriendSessions: ->
-    FB.api '/me/friends', (response) =>
-      @facebookData = response.data
-      levelFrag = "#{@level.get('original')}.#{@level.get('version').major}"
-      url = "/db/level/#{levelFrag}/leaderboard_facebook_friends"
-      $.ajax url, {
-        data: { friendIDs: (f.id for f in @facebookData) }
-        method: 'POST'
-        success: @onFacebookFriendSessionsLoaded
-      }
+    levelFrag = "#{@level.get('original')}.#{@level.get('version').major}"
+    url = "/db/level/#{levelFrag}/leaderboard_facebook_friends"
+    jqxhr = $.ajax url, {
+      data: { friendIDs: (f.id for f in @facebookData) }
+      method: 'POST'
+      success: @onFacebookFriendSessionsLoaded
+    }
+    @addRequestToLoad(jqxhr, 'facebook_friend_sessions', 'loadFacebookFriendSessions')
 
   onFacebookFriendSessionsLoaded: (result) =>
     friendsMap = {}
@@ -79,9 +89,7 @@ module.exports = class LadderTabView extends CocoView
       friend.otherTeam = if friend.team is 'humans' then 'ogres' else 'humans'
       friend.imageSource = "http://graph.facebook.com/#{friend.facebookID}/picture"
     @facebookFriendSessions = result
-    @loadingFacebookFriends = false
-    @renderMaybe()
-
+    
   # GOOGLE PLUS
 
   onConnectGPlus: ->
@@ -93,21 +101,23 @@ module.exports = class LadderTabView extends CocoView
     
   gplusSessionStateLoaded: ->
     if application.gplusHandler.loggedIn
-      @loadingGPlusFriends = true
+      @addSomethingToLoad("gplus_friends")
       application.gplusHandler.loadFriends @gplusFriendsLoaded
-    else
-      @loadingGPlusFriends = false
-      @renderMaybe()
 
   gplusFriendsLoaded: (friends) =>
     @gplusData = friends.items
+    @loadGPlusFriendSessions()
+    @somethingLoaded("gplus_friends")
+
+  loadGPlusFriendSessions: ->
     levelFrag = "#{@level.get('original')}.#{@level.get('version').major}"
     url = "/db/level/#{levelFrag}/leaderboard_gplus_friends"
-    $.ajax url, {
+    jqxhr = $.ajax url, {
       data: { friendIDs: (f.id for f in @gplusData) }
       method: 'POST'
       success: @onGPlusFriendSessionsLoaded
     }
+    @addRequestToLoad(jqxhr, 'gplus_friend_sessions', 'loadGPlusFriendSessions')
 
   onGPlusFriendSessionsLoaded: (result) =>
     friendsMap = {}
@@ -117,30 +127,29 @@ module.exports = class LadderTabView extends CocoView
       friend.otherTeam = if friend.team is 'humans' then 'ogres' else 'humans'
       friend.imageSource = friendsMap[friend.gplusID].image.url
     @gplusFriendSessions = result
-    @loadingGPlusFriends = false
-    @renderMaybe()
     
   # LADDER LOADING
 
   refreshLadder: ->
-    promises = []
     for team in @teams
-      @leaderboards[team.id]?.off 'sync'
+      @leaderboards[team.id]?.destroy()
       teamSession = _.find @sessions.models, (session) -> session.get('team') is team.id
       @leaderboards[team.id] = new LeaderboardData(@level, team.id, teamSession)
-      promises.push @leaderboards[team.id].promise
-    @loadingLeaderboards = true
-    $.when(promises...).then(@leaderboardsLoaded)
 
-  leaderboardsLoaded: =>
-    @loadingLeaderboards = false
-    @renderMaybe()
-
-  renderMaybe: ->
-    return if @loadingFacebookFriends or @loadingLeaderboards or @loadingGPlusFriends
-    @startsLoading = false
-    @render()
+      @addResourceToLoad @leaderboards[team.id], 'leaderboard', 3
 
+  render: ->
+    super()
+  
+    @$el.find('.histogram-display').each (i, el) =>
+      histogramWrapper = $(el)
+      team = _.find @teams, name: histogramWrapper.data('team-name')
+      histogramData = null
+      $.when(
+        $.get("/db/level/#{@level.get('slug')}/histogram_data?team=#{team.name.toLowerCase()}", (data) -> histogramData = data)
+      ).then =>
+        @generateHistogram(histogramWrapper, histogramData, team.name.toLowerCase())
+        
   getRenderData: ->
     ctx = super()
     ctx.level = @level
@@ -153,6 +162,82 @@ module.exports = class LadderTabView extends CocoView
     ctx.onGPlus = application.gplusHandler.loggedIn
     ctx
 
+  generateHistogram: (histogramElement, histogramData, teamName) ->
+    #renders twice, hack fix
+    if $("#"+histogramElement.attr("id")).has("svg").length then return
+    histogramData = histogramData.map (d) -> d*100
+      
+    margin =
+      top: 20
+      right: 20
+      bottom: 30
+      left: 0
+
+    width = 300 - margin.left - margin.right
+    height = 125 - margin.top - margin.bottom
+    
+    formatCount = d3.format(",.0")
+    
+    x = d3.scale.linear().domain([-3000,6000]).range([0,width])
+
+    data = d3.layout.histogram().bins(x.ticks(20))(histogramData)
+    y = d3.scale.linear().domain([0,d3.max(data, (d) -> d.y)]).range([height,0])
+    
+    #create the x axis
+    xAxis = d3.svg.axis().scale(x).orient("bottom").ticks(5).outerTickSize(0)
+    
+    svg = d3.select("#"+histogramElement.attr("id")).append("svg")
+      .attr("width", width + margin.left + margin.right)
+      .attr("height", height + margin.top + margin.bottom)
+    .append("g")
+      .attr("transform","translate(#{margin.left},#{margin.top})")
+    barClass = "bar"
+    if teamName.toLowerCase() is "ogres" then barClass = "ogres-bar"
+    if teamName.toLowerCase() is "humans" then barClass = "humans-bar"
+    
+    bar = svg.selectAll(".bar")
+      .data(data)
+    .enter().append("g")
+      .attr("class",barClass)
+      .attr("transform", (d) -> "translate(#{x(d.x)},#{y(d.y)})")  
+    
+    bar.append("rect")
+      .attr("x",1)
+      .attr("width",width/20)
+      .attr("height", (d) -> height - y(d.y))
+    if @leaderboards[teamName].session?
+      playerScore = @leaderboards[teamName].session.get('totalScore') * 100
+      scorebar = svg.selectAll(".specialbar")
+        .data([playerScore])
+        .enter().append("g")
+        .attr("class","specialbar")
+        .attr("transform", "translate(#{x(playerScore)},#{y(9001)})")
+      
+      scorebar.append("rect")
+        .attr("x",1)
+        .attr("width",3)
+        .attr("height",height - y(9001))
+    rankClass = "rank-text"
+    if teamName.toLowerCase() is "ogres" then rankClass = "rank-text ogres-rank-text"
+    if teamName.toLowerCase() is "humans" then rankClass = "rank-text humans-rank-text"
+    
+    message = "#{histogramData.length} players"
+    if @leaderboards[teamName].session? then message="#{@leaderboards[teamName].myRank}/#{histogramData.length}"
+    svg.append("g")
+      .append("text")
+      .attr("class",rankClass)
+      .attr("y",0)
+      .attr("text-anchor","end")
+      .attr("x",width)
+      .text(message)
+        
+    #Translate the x-axis up
+    svg.append("g")
+      .attr("class", "x axis")
+      .attr("transform","translate(0," + height + ")")
+      .call(xAxis)
+    
+    
   consolidateFriends: ->
     allFriendSessions = (@facebookFriendSessions or []).concat(@gplusFriendSessions or [])
     sessions = _.uniq allFriendSessions, false, (session) -> session._id
@@ -160,9 +245,16 @@ module.exports = class LadderTabView extends CocoView
     sessions.reverse()
     sessions
 
-class LeaderboardData
+class LeaderboardData extends CocoClass
+  ###
+  Consolidates what you need to load for a leaderboard into a single Backbone Model-like object.
+  ###
+  
   constructor: (@level, @team, @session) ->
-    _.extend @, Backbone.Events
+    super()
+    @fetch()
+    
+  fetch: ->
     @topPlayers = new LeaderboardCollection(@level, {order:-1, scoreOffset: HIGHEST_SCORE, team: @team, limit: 20})
     promises = []
     promises.push @topPlayers.fetch()
@@ -173,18 +265,24 @@ class LeaderboardData
       promises.push @playersAbove.fetch()
       @playersBelow = new LeaderboardCollection(@level, {order:-1, scoreOffset: score, limit: 4, team: @team})
       promises.push @playersBelow.fetch()
-      level = "#{level.get('original')}.#{level.get('version').major}"
+      level = "#{@level.get('original')}.#{@level.get('version').major}"
       success = (@myRank) =>
       promises.push $.ajax "/db/level/#{level}/leaderboard_rank?scoreOffset=#{@session.get('totalScore')}&team=#{@team}", {success}
     @promise = $.when(promises...)
     @promise.then @onLoad
+    @promise.fail @onFail
     @promise
 
   onLoad: =>
+    return if @destroyed
     @loaded = true
-    @trigger 'sync'
+    @trigger 'sync', @
     # TODO: cache user ids -> names mapping, and load them here as needed,
     #   and apply them to sessions. Fetching each and every time is too costly.
+  
+  onFail: (resource, jqxhr) =>
+    return if @destroyed
+    @trigger 'error', @, jqxhr
 
   inTopSessions: ->
     return me.id in (session.attributes.creator for session in @topPlayers.models)
@@ -201,3 +299,7 @@ class LeaderboardData
       startRank = @myRank - 4
       session.rank = startRank + i for session, i in l
     l
+
+  allResources: ->
+    resources = [@topPlayers, @playersAbove, @playersBelow]
+    return (r for r in resources when r)
diff --git a/app/views/play/ladder/my_matches_tab.coffee b/app/views/play/ladder/my_matches_tab.coffee
index 94e4f4731..e3f0fc62a 100644
--- a/app/views/play/ladder/my_matches_tab.coffee
+++ b/app/views/play/ladder/my_matches_tab.coffee
@@ -117,12 +117,10 @@ module.exports = class MyMatchesTabView extends CocoView
     @$el.find('.score-chart-wrapper').each (i, el) =>
       scoreWrapper = $(el)
       team = _.find @teams, name: scoreWrapper.data('team-name')
-      @generateScoreLineChart(scoreWrapper.attr('id'), team.scoreHistory)
+      @generateScoreLineChart(scoreWrapper.attr('id'), team.scoreHistory, team.name)
       
 
-  generateScoreLineChart: (wrapperID, scoreHistory) =>
-    
-    
+  generateScoreLineChart: (wrapperID, scoreHistory,teamName) =>
     margin = 
       top: 20
       right: 20
@@ -167,10 +165,12 @@ module.exports = class MyMatchesTabView extends CocoView
       .attr("dy", ".75em")
       .style("text-anchor","end")
       .text("Score")
-    
+    lineClass = "line"
+    if teamName.toLowerCase() is "ogres" then lineClass = "ogres-line"
+    if teamName.toLowerCase() is "humans" then lineClass = "humans-line"
     svg.append("path")
       .datum(data)
-      .attr("class","line")
+      .attr("class",lineClass)
       .attr("d",line)
     
     
diff --git a/app/views/play/ladder_view.coffee b/app/views/play/ladder_view.coffee
index 6d1e90313..58366fa58 100644
--- a/app/views/play/ladder_view.coffee
+++ b/app/views/play/ladder_view.coffee
@@ -24,7 +24,6 @@ class LevelSessionsCollection extends CocoCollection
 module.exports = class LadderView extends RootView
   id: 'ladder-view'
   template: require 'templates/play/ladder'
-  startsLoading: true
 
   subscriptions:
     'application:idle-changed': 'onIdleChanged'
@@ -38,18 +37,18 @@ module.exports = class LadderView extends RootView
   constructor: (options, @levelID) ->
     super(options)
     @level = new Level(_id:@levelID)
-    p1 = @level.fetch()
+    @level.fetch()
     @sessions = new LevelSessionsCollection(levelID)
-    p2 = @sessions.fetch({})
+    @sessions.fetch({})
+    @addResourceToLoad(@sessions, 'your_sessions')
+    @addResourceToLoad(@level, 'level')
     @simulator = new Simulator()
     @listenTo(@simulator, 'statusUpdate', @updateSimulationStatus)
     @teams = []
-    $.when(p1, p2).then @onLoaded
 
-  onLoaded: =>
+  onLoaded: ->
     @teams = teamDataFromLevel @level
-    @startsLoading = false
-    @render()
+    super()
 
   getRenderData: ->
     ctx = super()
@@ -63,7 +62,7 @@ module.exports = class LadderView extends RootView
 
   afterRender: ->
     super()
-    return if @startsLoading
+    return if @loading()
     @insertSubView(@ladderTab = new LadderTabView({}, @level, @sessions))
     @insertSubView(@myMatchesTab = new MyMatchesTabView({}, @level, @sessions))
     @refreshInterval = setInterval(@fetchSessionsAndRefreshViews.bind(@), 10 * 1000)
@@ -72,7 +71,7 @@ module.exports = class LadderView extends RootView
       @showPlayModal(hash) if @sessions.loaded
 
   fetchSessionsAndRefreshViews: ->
-    return if @destroyed or application.userIsIdle or @$el.find('#simulate.active').length or (new Date() - 2000 < @lastRefreshTime) or @startsLoading
+    return if @destroyed or application.userIsIdle or @$el.find('#simulate.active').length or (new Date() - 2000 < @lastRefreshTime) or @loading()
     @sessions.fetch({"success": @refreshViews})
 
   refreshViews: =>
diff --git a/app/views/play/level/modal/victory_modal.coffee b/app/views/play/level/modal/victory_modal.coffee
index 3eb7d21f5..3fe539b99 100644
--- a/app/views/play/level/modal/victory_modal.coffee
+++ b/app/views/play/level/modal/victory_modal.coffee
@@ -78,7 +78,7 @@ module.exports = class VictoryModal extends View
     c = super()
     c.body = @body
     c.me = me
-    c.hasNextLevel = _.isObject(@level.get('nextLevel')) and (@level.get('name') isnt "Mobile Artillery")
+    c.hasNextLevel = _.isObject(@level.get('nextLevel'))
     c.levelName = utils.i18n @level.attributes, 'name'
     c.level = @level
     if c.level.get('type') is 'ladder'
diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee
index 17a813459..4951b6915 100644
--- a/app/views/play/level/tome/spell_view.coffee
+++ b/app/views/play/level/tome/spell_view.coffee
@@ -63,7 +63,7 @@ module.exports = class SpellView extends View
       @createFirepad()
     else
       # needs to happen after the code generating this view is complete
-      setTimeout @onLoaded, 1
+      setTimeout @onAllLoaded, 1
 
   createACE: ->
     # Test themes and settings here: http://ace.ajax.org/build/kitchen-sink.html
@@ -178,9 +178,9 @@ module.exports = class SpellView extends View
     else
       @ace.setValue @previousSource
       @ace.clearSelection()
-    @onLoaded()
+    @onAllLoaded()
 
-  onLoaded: =>
+  onAllLoaded: =>
     @spell.transpile @spell.source
     @spell.loaded = true
     Backbone.Mediator.publish 'tome:spell-loaded', spell: @spell
diff --git a/scripts/windows/coco-dev-setup/batch/config/config.coco b/scripts/windows/coco-dev-setup/batch/config/config.coco
index ae8c66f56..eba46b0f4 100755
--- a/scripts/windows/coco-dev-setup/batch/config/config.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/config.coco
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <variables>
-    <version>1.0</version>
+    <version>1.2</version>
     <author>GlenDC</author>
     <copyright>CodeCombat.com � 2013-2014</copyright>
+    <github_url>https://github.com/codecombat/codecombat.git</github_url>
+    <github_ssh>git@github.com:codecombat/codecombat.git</github_ssh>
 </variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/downloads.coco b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
index 2a0472c41..771189954 100755
--- a/scripts/windows/coco-dev-setup/batch/config/downloads.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
@@ -4,21 +4,35 @@
         <b32>
             <nodejs>http://nodejs.org/dist/v0.10.25/node-v0.10.25-x86.msi</nodejs>
             <ruby>http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353.exe?direct</ruby>
-            <python>http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi</python>
+            <python>http://s3.amazonaws.com/CodeCombatLargeFiles/python-32.msi</python>
+            <vs12redist>http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe</vs12redist>
         </b32>
         <b64>
             <nodejs>http://nodejs.org/dist/v0.10.25/x64/node-v0.10.25-x64.msi</nodejs>
             <ruby>http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct</ruby>
-            <python>http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi</python>
+            <python>http://s3.amazonaws.com/CodeCombatLargeFiles/python-64.msi</python>
+            <winsdk>http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe</winsdk>
+            <vs12redist>http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe</vs12redist>
         </b64>
-        <gitbash>https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe</gitbash>
+        <general>
+            <gitbash>https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe</gitbash>
+            <vs10redist>http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe</vs10redist>
+        </general>
     </general>
-    <win7>
-        <b32>mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip</b32>
-        <b64>mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip</b64>
-    </win7>
-    <vista>
-        <b32>mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip</b32>
-        <b64>mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.5.4.zip</b64>
-    </vista>
+    <Win7>
+        <b32>
+            <mongodb>http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip</mongodb>
+        </b32>
+        <b64>
+            <mongodb>http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip</mongodb>
+        </b64>
+    </Win7>
+    <Vista>
+        <b32>
+            <mongodb>http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip</mongodb>
+        </b32>
+        <b64>
+            <mongodb>http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.5.4.zip</mongodb>
+        </b64>
+    </Vista>
 </variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/tips.coco b/scripts/windows/coco-dev-setup/batch/config/tips.coco
index 0a4bb84c4..896086692 100755
--- a/scripts/windows/coco-dev-setup/batch/config/tips.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/tips.coco
@@ -4,4 +4,4 @@
   4) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
  
   You can find a step-by-step guide for this installation on our wiki.
-  https://github.com/codecombat/codecombat/wiki/<guide_path>
\ No newline at end of file
+  github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/de.coco b/scripts/windows/coco-dev-setup/batch/localisation/de.coco
index 6c3105433..fc257a64d 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/de.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/de.coco
@@ -15,10 +15,11 @@
 			<sks>Sind die für CodeCombat benötigten Programme bereits installiert?</sks>
 			<skq>Wir empfehlen Ihnen, mit „Nein“ zu antorten, falls Sie unsicher sind.</skq>
 			<skc>Überspringe Installation der Programme...</skc>
-			<1>Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.</1>
-			<2>Aus diesem Grund müssen Sie diese Software installieren,</2>
-			<3>um sich in der Community zu engagieren.</3>
-			<4>Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.</4>
+			<s1>Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.</s1>
+			<s2>Aus diesem Grund müssen Sie diese Software installieren,</s2>
+			<s3>um sich in der Community zu engagieren.</s3>
+			<s4>Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
 			<prefix>Haben Sie bereits die aktuellste Version von</prefix>
 			<sufix>installiert?</sufix>
 			<downloading>wird heruntergeladen...</downloading>
@@ -30,16 +31,16 @@
 	</install>
 	<github>
 		<intro>
-			<opensource>Wie Du bereits weißt, ist CodeCombat Open Source.
-			<online>Unser Quellcode ist komplett auf Github.
-			<manual>Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.
-			<norec>Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.
+			<opensource>Wie Du bereits weißt, ist CodeCombat Open Source.</opensource>
+			<online>Unser Quellcode ist komplett auf Github.</online>
+			<manual>Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.</manual>
+			<norec>Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.</norec>
 		</intro>
 		<skip>
-			<question>Willst du das lokale Git Setup selbst vornehmen?
-			<consequence>Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.
-			<donotclose>Bitte schließe dieses Fenster nicht.
-			<wait>Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...
+			<question>Willst du das lokale Git Setup selbst vornehmen?</question>
+			<consequence>Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.</consequence>
+			<donotclose>Bitte schließe dieses Fenster nicht.</donotclose>
+			<wait>Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...</wait>
 		</skip>
 		<process>
 			<path>Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein: </path>
@@ -62,7 +63,7 @@
 		<script>Preparing the automatic startup script for you...</script>
 	</npm>
 	<error>
-		<path>Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?<path>
+		<path>Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?</path>
 		<exist>Dieser Pfad exisitert nicht. Bitte versuche es erneut...</exist>
 	</error>
 	<end>
@@ -71,11 +72,11 @@
 		<readme>Willst du das README lesen, um weitere Informationen zu erhalten?</readme>
 	</end>
 	<start>
-		<1>Von nun an kannst du die Entwicklungsumgebung starten unter</1>
-		<2>einmal mit der Maus klicken.</2>
-		<3>  1) Einfach Doppelklicken</3>
-		<4>und warten bis die Entwicklungsumgebung fertig geladen hat.</4>
-		<5>  2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.</5>
-		<6>Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!</6>
+		<s1>Von nun an kannst du die Entwicklungsumgebung starten unter</s1>
+		<s2>einmal mit der Maus klicken.</s2>
+		<s3>  1) Einfach Doppelklicken</s3>
+		<s4>und warten bis die Entwicklungsumgebung fertig geladen hat.</s4>
+		<s5>  2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.</s5>
+		<s6>Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!</s6>
 	</start>
 </variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
index 96934bf3e..947890ee8 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
@@ -15,10 +15,11 @@
 			<sks>Have you already installed all the software needed for CodeCombat?</sks>
 			<skq>We recommand that you reply negative in case you're not sure.</skq>
 			<skc>Skipping the installation of the software...</skc>
-			<1>CodeCombat couldn't be developed without third-party software.</1>
-			<2>That's why you'll need to install this software,</2>
-			<3>in order to start contributing to our community.</3>
-			<4>Cancel the installation if you already have the application.</4>
+			<s1>CodeCombat couldn't be developed without third-party software.</s1>
+			<s2>That's why you'll need to install this software,</s2>
+			<s3>in order to start contributing to our community.</s3>
+			<s4>Cancel the installation if you already have the application.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
 			<prefix>Do you already have the latest version of</prefix>
 			<sufix>installed?</sufix>
 			<downloading>is downloading...</downloading>
@@ -71,11 +72,11 @@
 		<readme>Do you want to read the README for more information?</readme>
 	</end>
 	<start>
-		<1>From now on you can start the dev. environment at</1>
-		<2>the touch of a single mouse click.</2>
-		<3>  1) Just double click</3>
-		<4>     and let the environment start up.</4>
-		<5>  2) Now just open 'localhost:3000' in your prefered browser.</5>
-		<6>That's it, you're now ready to start working on CodeCombat!</6>
+		<s1>From now on you can start the dev. environment at</s1>
+		<s2>the touch of a single mouse click.</s2>
+		<s3>  1) Just double click</s3>
+		<s4>     and let the environment start up.</s4>
+		<s5>  2) Now just open 'localhost:3000' in your prefered browser.</s5>
+		<s6>That's it, you're now ready to start working on CodeCombat!</s6>
 	</start>
 </variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/fr.coco b/scripts/windows/coco-dev-setup/batch/localisation/fr.coco
new file mode 100755
index 000000000..1c92b433c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/fr.coco
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<variables>
+	<global>
+		<native>français</native>
+		<intro>From now on we'll send our feedback in English!</intro>
+	</global>
+	<install>
+		<system>
+			<bit>-bit computer detected.</bit>
+			<prefix>The operating system</prefix>
+			<sufix>was detected.</sufix>
+			<xp>We don't support Windows XP, installation cancelled.</xp>
+		</system>
+		<process>
+			<sks>Have you already installed all the software needed for CodeCombat?</sks>
+			<skq>We recommand that you reply negative in case you're not sure.</skq>
+			<skc>Skipping the installation of the software...</skc>
+			<s1>CodeCombat couldn't be developed without third-party software.</s1>
+			<s2>That's why you'll need to install this software,</s2>
+			<s3>in order to start contributing to our community.</s3>
+			<s4>Cancel the installation if you already have the application.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
+			<prefix>Do you already have the latest version of</prefix>
+			<sufix>installed?</sufix>
+			<downloading>is downloading...</downloading>
+			<installing>is installing...</installing>
+			<unzipping>is unzipping...</unzipping>
+			<cleaning>is cleaning...</cleaning>
+			<mongodbpath>Please define the full path where mongodb should be installed</mongodbpath>
+		</process>
+	</install>
+	<github>
+		<intro>
+			<opensource>CodeCombat is opensource, like you already know.</opensource>
+			<online>All our sourcecode can be found online at Github.</online>
+			<manual>You can choose to do the entire Git setup yourself.</manual>
+			<norec>However we recommend that you instead let us handle it instead.</norec>
+		</intro>
+		<skip>
+			<question>Do you want to do the Local Git setup manually yourself?</question>
+			<consequence>Make sure you have correctly setup your repository before processing.</consequence>
+			<donotclose>Do not close this window please.</donotclose>
+			<wait>When you're ready, press any key to continue...</wait>
+		</skip>
+		<process>
+			<path>Please give the full path of your CodeCombat git repository: </path>
+			<checkout>Please enter the full path where you want to install your CodeCombat environment</checkout>
+			<bashi>This installation requires Git Bash.</bashi>
+			<bashp64>Git bash is by default installed at 'C:\Program Files (x86)\Git'.</bashp64>
+			<bashp32>Git bash is by default installed at 'C:\Program Files\Git'.</bashp32>
+			<bashq>Please enter the full path where git bash is installed or just press enter if it's in the default location</bashq>
+			<ssh>Do you want to checkout the repository via ssh?</ssh>
+		</process>
+	</github>
+	<npm>
+		<install>Installing bower, brunch, nodemon and sendwithus...</install>
+		<binstall>Installing bower packages...</binstall>
+		<sass>Installing sass...</sass>
+		<npm>Installing npm...</npm>
+		<brnch>Starting brunch....</brnch>
+		<mongodb>Setting up a MongoDB database for you...</mongodb>
+		<db>Downloading the last version of the CodeCombat database...</db>
+		<script>Preparing the automatic startup script for you...</script>
+	</npm>
+	<error>
+		<path>That path already exists, are you sure you want to overwrite it?</path>
+		<exist>That path doesn't exist. Please try again...</exist>
+	</error>
+	<end>
+		<succesfull>The setup of the CodeCombat Dev. Environment was succesfull.</succesfull>
+		<thankyou>Thank you already for your contribution and see you soon.</thankyou>
+		<readme>Do you want to read the README for more information?</readme>
+	</end>
+	<start>
+		<s1>From now on you can start the dev. environment at</s1>
+		<s2>the touch of a single mouse click.</s2>
+		<s3>  1) Just double click</s3>
+		<s4>     and let the environment start up.</s4>
+		<s5>  2) Now just open 'localhost:3000' in your prefered browser.</s5>
+		<s6>That's it, you're now ready to start working on CodeCombat!</s6>
+	</start>
+</variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/languages.coco b/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
index da3331dfe..a267d65d0 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
@@ -1,3 +1,7 @@
 en
 nl
-de
\ No newline at end of file
+de
+fr
+zh
+zh-HANT
+zh-HANS
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
index 64bdf8c58..654d45c97 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
@@ -15,10 +15,11 @@
 			<sks>Heb je alle benodige software al geinstalleerd?</sks>
 			<skq>We raden aan dat je negatief antwoord indien je niet zeker bent.</skq>
 			<skc>De installatie van software wordt geanulleerd...</skc>
-			<1>CodeCombat kon niet worden ontwikkeld zonder third-party software.</1>
-			<2>Dat is waarom je deze software moet installeren,</2>
-			<3>zodat je je kan beginnen met het bijdragen tot onze gemeenschap.</3>
-			<4>Annuleer de installatie als je de applicatie al hebt.</4>
+			<s1>CodeCombat kon niet worden ontwikkeld zonder third-party software.</s1>
+			<s2>Dat is waarom je deze software moet installeren,</s2>
+			<s3>zodat je je kan beginnen met het bijdragen tot onze gemeenschap.</s3>
+			<s4>Annuleer de installatie als je de applicatie al hebt.</s4>
+			<winpath>Zorg er zeker voor dat je de optie selecteert dat de applicatie aan je Windows Path toevoegt, als de optie beschikbaar is.</winpath>
 			<prefix>Heb je al de laatste versie van</prefix>
 			<sufix>geinstalleerd?</sufix>
 			<downloading>is aan het downloaden...</downloading>
@@ -71,11 +72,11 @@
 		<readme>Wil je de LEESMIJ lezen voor meer informatie?</readme>
 	</end>
 	<start>
-		<1>Vanaf nu kan je de ontwikkelings omgeving opstarten</1>
-		<2>met het gemak van een enkele muisklik.</2>
-		<3>  1) Dubbelklik op</3>
-		<4>en laat de omgeving opstarten.</4>
-		<5>  2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.</5>
-		<6>Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.</6>
+		<s1>Vanaf nu kan je de ontwikkelings omgeving opstarten</s1>
+		<s2>met het gemak van een enkele muisklik.</s2>
+		<s3>  1) Dubbelklik op</s3>
+		<s4>en laat de omgeving opstarten.</s4>
+		<s5>  2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.</s5>
+		<s6>Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.</s6>
 	</start>
 </variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
new file mode 100755
index 000000000..2eca2705c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<variables>
+	<global>
+		<native>简体中文</native>
+		<intro>From now on we'll send our feedback in English!</intro>
+	</global>
+	<install>
+		<system>
+			<bit>-bit computer detected.</bit>
+			<prefix>The operating system</prefix>
+			<sufix>was detected.</sufix>
+			<xp>We don't support Windows XP, installation cancelled.</xp>
+		</system>
+		<process>
+			<sks>Have you already installed all the software needed for CodeCombat?</sks>
+			<skq>We recommand that you reply negative in case you're not sure.</skq>
+			<skc>Skipping the installation of the software...</skc>
+			<s1>CodeCombat couldn't be developed without third-party software.</s1>
+			<s2>That's why you'll need to install this software,</s2>
+			<s3>in order to start contributing to our community.</s3>
+			<s4>Cancel the installation if you already have the application.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
+			<prefix>Do you already have the latest version of</prefix>
+			<sufix>installed?</sufix>
+			<downloading>is downloading...</downloading>
+			<installing>is installing...</installing>
+			<unzipping>is unzipping...</unzipping>
+			<cleaning>is cleaning...</cleaning>
+			<mongodbpath>Please define the full path where mongodb should be installed</mongodbpath>
+		</process>
+	</install>
+	<github>
+		<intro>
+			<opensource>CodeCombat is opensource, like you already know.</opensource>
+			<online>All our sourcecode can be found online at Github.</online>
+			<manual>You can choose to do the entire Git setup yourself.</manual>
+			<norec>However we recommend that you instead let us handle it instead.</norec>
+		</intro>
+		<skip>
+			<question>Do you want to do the Local Git setup manually yourself?</question>
+			<consequence>Make sure you have correctly setup your repository before processing.</consequence>
+			<donotclose>Do not close this window please.</donotclose>
+			<wait>When you're ready, press any key to continue...</wait>
+		</skip>
+		<process>
+			<path>Please give the full path of your CodeCombat git repository: </path>
+			<checkout>Please enter the full path where you want to install your CodeCombat environment</checkout>
+			<bashi>This installation requires Git Bash.</bashi>
+			<bashp64>Git bash is by default installed at 'C:\Program Files (x86)\Git'.</bashp64>
+			<bashp32>Git bash is by default installed at 'C:\Program Files\Git'.</bashp32>
+			<bashq>Please enter the full path where git bash is installed or just press enter if it's in the default location</bashq>
+			<ssh>Do you want to checkout the repository via ssh?</ssh>
+		</process>
+	</github>
+	<npm>
+		<install>Installing bower, brunch, nodemon and sendwithus...</install>
+		<binstall>Installing bower packages...</binstall>
+		<sass>Installing sass...</sass>
+		<npm>Installing npm...</npm>
+		<brnch>Starting brunch....</brnch>
+		<mongodb>Setting up a MongoDB database for you...</mongodb>
+		<db>Downloading the last version of the CodeCombat database...</db>
+		<script>Preparing the automatic startup script for you...</script>
+	</npm>
+	<error>
+		<path>That path already exists, are you sure you want to overwrite it?</path>
+		<exist>That path doesn't exist. Please try again...</exist>
+	</error>
+	<end>
+		<succesfull>The setup of the CodeCombat Dev. Environment was succesfull.</succesfull>
+		<thankyou>Thank you already for your contribution and see you soon.</thankyou>
+		<readme>Do you want to read the README for more information?</readme>
+	</end>
+	<start>
+		<s1>From now on you can start the dev. environment at</s1>
+		<s2>the touch of a single mouse click.</s2>
+		<s3>  1) Just double click</s3>
+		<s4>     and let the environment start up.</s4>
+		<s5>  2) Now just open 'localhost:3000' in your prefered browser.</s5>
+		<s6>That's it, you're now ready to start working on CodeCombat!</s6>
+	</start>
+</variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
new file mode 100755
index 000000000..93bcefd87
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<variables>
+	<global>
+		<native>繁体中文</native>
+		<intro>From now on we'll send our feedback in English!</intro>
+	</global>
+	<install>
+		<system>
+			<bit>-bit computer detected.</bit>
+			<prefix>The operating system</prefix>
+			<sufix>was detected.</sufix>
+			<xp>We don't support Windows XP, installation cancelled.</xp>
+		</system>
+		<process>
+			<sks>Have you already installed all the software needed for CodeCombat?</sks>
+			<skq>We recommand that you reply negative in case you're not sure.</skq>
+			<skc>Skipping the installation of the software...</skc>
+			<s1>CodeCombat couldn't be developed without third-party software.</s1>
+			<s2>That's why you'll need to install this software,</s2>
+			<s3>in order to start contributing to our community.</s3>
+			<s4>Cancel the installation if you already have the application.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
+			<prefix>Do you already have the latest version of</prefix>
+			<sufix>installed?</sufix>
+			<downloading>is downloading...</downloading>
+			<installing>is installing...</installing>
+			<unzipping>is unzipping...</unzipping>
+			<cleaning>is cleaning...</cleaning>
+			<mongodbpath>Please define the full path where mongodb should be installed</mongodbpath>
+		</process>
+	</install>
+	<github>
+		<intro>
+			<opensource>CodeCombat is opensource, like you already know.</opensource>
+			<online>All our sourcecode can be found online at Github.</online>
+			<manual>You can choose to do the entire Git setup yourself.</manual>
+			<norec>However we recommend that you instead let us handle it instead.</norec>
+		</intro>
+		<skip>
+			<question>Do you want to do the Local Git setup manually yourself?</question>
+			<consequence>Make sure you have correctly setup your repository before processing.</consequence>
+			<donotclose>Do not close this window please.</donotclose>
+			<wait>When you're ready, press any key to continue...</wait>
+		</skip>
+		<process>
+			<path>Please give the full path of your CodeCombat git repository: </path>
+			<checkout>Please enter the full path where you want to install your CodeCombat environment</checkout>
+			<bashi>This installation requires Git Bash.</bashi>
+			<bashp64>Git bash is by default installed at 'C:\Program Files (x86)\Git'.</bashp64>
+			<bashp32>Git bash is by default installed at 'C:\Program Files\Git'.</bashp32>
+			<bashq>Please enter the full path where git bash is installed or just press enter if it's in the default location</bashq>
+			<ssh>Do you want to checkout the repository via ssh?</ssh>
+		</process>
+	</github>
+	<npm>
+		<install>Installing bower, brunch, nodemon and sendwithus...</install>
+		<binstall>Installing bower packages...</binstall>
+		<sass>Installing sass...</sass>
+		<npm>Installing npm...</npm>
+		<brnch>Starting brunch....</brnch>
+		<mongodb>Setting up a MongoDB database for you...</mongodb>
+		<db>Downloading the last version of the CodeCombat database...</db>
+		<script>Preparing the automatic startup script for you...</script>
+	</npm>
+	<error>
+		<path>That path already exists, are you sure you want to overwrite it?</path>
+		<exist>That path doesn't exist. Please try again...</exist>
+	</error>
+	<end>
+		<succesfull>The setup of the CodeCombat Dev. Environment was succesfull.</succesfull>
+		<thankyou>Thank you already for your contribution and see you soon.</thankyou>
+		<readme>Do you want to read the README for more information?</readme>
+	</end>
+	<start>
+		<s1>From now on you can start the dev. environment at</s1>
+		<s2>the touch of a single mouse click.</s2>
+		<s3>  1) Just double click</s3>
+		<s4>     and let the environment start up.</s4>
+		<s5>  2) Now just open 'localhost:3000' in your prefered browser.</s5>
+		<s6>That's it, you're now ready to start working on CodeCombat!</s6>
+	</start>
+</variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh.coco
new file mode 100755
index 000000000..b84d84146
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/zh.coco
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<variables>
+	<global>
+		<native>中文</native>
+		<intro>From now on we'll send our feedback in English!</intro>
+	</global>
+	<install>
+		<system>
+			<bit>-bit computer detected.</bit>
+			<prefix>The operating system</prefix>
+			<sufix>was detected.</sufix>
+			<xp>We don't support Windows XP, installation cancelled.</xp>
+		</system>
+		<process>
+			<sks>Have you already installed all the software needed for CodeCombat?</sks>
+			<skq>We recommand that you reply negative in case you're not sure.</skq>
+			<skc>Skipping the installation of the software...</skc>
+			<s1>CodeCombat couldn't be developed without third-party software.</s1>
+			<s2>That's why you'll need to install this software,</s2>
+			<s3>in order to start contributing to our community.</s3>
+			<s4>Cancel the installation if you already have the application.</s4>
+			<winpath>Make sure to select the option that adds the application to your Windows Path, if the option is available.</winpath>
+			<prefix>Do you already have the latest version of</prefix>
+			<sufix>installed?</sufix>
+			<downloading>is downloading...</downloading>
+			<installing>is installing...</installing>
+			<unzipping>is unzipping...</unzipping>
+			<cleaning>is cleaning...</cleaning>
+			<mongodbpath>Please define the full path where mongodb should be installed</mongodbpath>
+		</process>
+	</install>
+	<github>
+		<intro>
+			<opensource>CodeCombat is opensource, like you already know.</opensource>
+			<online>All our sourcecode can be found online at Github.</online>
+			<manual>You can choose to do the entire Git setup yourself.</manual>
+			<norec>However we recommend that you instead let us handle it instead.</norec>
+		</intro>
+		<skip>
+			<question>Do you want to do the Local Git setup manually yourself?</question>
+			<consequence>Make sure you have correctly setup your repository before processing.</consequence>
+			<donotclose>Do not close this window please.</donotclose>
+			<wait>When you're ready, press any key to continue...</wait>
+		</skip>
+		<process>
+			<path>Please give the full path of your CodeCombat git repository: </path>
+			<checkout>Please enter the full path where you want to install your CodeCombat environment</checkout>
+			<bashi>This installation requires Git Bash.</bashi>
+			<bashp64>Git bash is by default installed at 'C:\Program Files (x86)\Git'.</bashp64>
+			<bashp32>Git bash is by default installed at 'C:\Program Files\Git'.</bashp32>
+			<bashq>Please enter the full path where git bash is installed or just press enter if it's in the default location</bashq>
+			<ssh>Do you want to checkout the repository via ssh?</ssh>
+		</process>
+	</github>
+	<npm>
+		<install>Installing bower, brunch, nodemon and sendwithus...</install>
+		<binstall>Installing bower packages...</binstall>
+		<sass>Installing sass...</sass>
+		<npm>Installing npm...</npm>
+		<brnch>Starting brunch....</brnch>
+		<mongodb>Setting up a MongoDB database for you...</mongodb>
+		<db>Downloading the last version of the CodeCombat database...</db>
+		<script>Preparing the automatic startup script for you...</script>
+	</npm>
+	<error>
+		<path>That path already exists, are you sure you want to overwrite it?</path>
+		<exist>That path doesn't exist. Please try again...</exist>
+	</error>
+	<end>
+		<succesfull>The setup of the CodeCombat Dev. Environment was succesfull.</succesfull>
+		<thankyou>Thank you already for your contribution and see you soon.</thankyou>
+		<readme>Do you want to read the README for more information?</readme>
+	</end>
+	<start>
+		<s1>From now on you can start the dev. environment at</s1>
+		<s2>the touch of a single mouse click.</s2>
+		<s3>  1) Just double click</s3>
+		<s4>     and let the environment start up.</s4>
+		<s5>  2) Now just open 'localhost:3000' in your prefered browser.</s5>
+		<s6>That's it, you're now ready to start working on CodeCombat!</s6>
+	</start>
+</variables>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
index b72e74dbd..8d85be8b1 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
@@ -6,8 +6,8 @@ if NOT exist "%temp_directory%" (
 	md %temp_directory%
 )
 
-call get_local_text install-process-prefix
-call get_local_text install-process-sufix
+call get_local_text install_process_prefix install process prefix
+call get_local_text install_process_sufix install process sufix
 
 call ask_question "!install_process_prefix! %1 !install_process_sufix!"
 
@@ -18,7 +18,7 @@ if "%result%"=="true" (
 call print_dashed_seperator
 
 call get_extension %2 download_extension
-call get_local_text install-process-downloading
+call get_local_text install_process_downloading install process downloading
 echo %1 !install_process_downloading!
 set "install_file=!temp_directory!%1.!download_extension!"
 %curl_app% -k %2 -o !install_file!
@@ -34,10 +34,10 @@ if "%download_extension%"=="zip" (
 	goto:get_mongodb_path
 
 	:get_mongodb_path
-		call get_local_text install-process-mongodbpath
+		call get_local_text install_process_mongodbpath install process mongodbpath
 		set /p "mongodb_path=!install_process_mongodbpath!: "
 		if exist "%mongodb_path%" (
-			call get_local_text error-path
+			call get_local_text error_path error path
 			call ask_question "!error_path!"
 			if "!result!"=="false" (
 				call print_dashed_seperator
@@ -52,14 +52,14 @@ if "%download_extension%"=="zip" (
 	goto:clean_up
 )
 
-call get_local_text install-process-installing
+call get_local_text install_process_installing install process installing
 echo %1 !install_process_installing!
 echo.
 start /WAIT !install_file!
 goto:clean_up
 
 :clean_up
-	call get_local_text install-process-cleaning
+	call get_local_text install_process_cleaning install process cleaning
 	echo %1 !install_process_cleaning!
 	rmdir /s /q "!temp_directory!"
 	goto:exit_installation
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
index 65c41f58d..3c5f798fd 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
@@ -1,16 +1,16 @@
 call print_install_header
 call print_dashed_seperator
 
-call get_local_text install-process-sks
+call get_local_text install_process_sks install process sks
 echo !install_process_sks!
 
-call get_local_text install-process-skq
+call get_local_text install_process_skq install process skq
 call ask_question "!install_process_skq!"
 
 call print_dashed_seperator
 
 if "%result%"=="true" (
-	call get_local_text install-process-skc
+	call get_local_text install_process_skc install process skc
 	echo !install_process_skc!
 	call print_dashed_seperator
 	goto:exit_setup
@@ -20,22 +20,27 @@ call get_system_information
 call print_dashed_seperator
 
 if %system_info_os% == XP (
-	call get_local_text install-system-xp
+	call get_local_text install_system_xp install system xp
 	echo !install_system_xp!
 	call print_exit
 )
 
-call get_category ..\\config\\downloads.coco downloads download_names downloads_count general-general general-%system_info_bit% %system_info_os%-%system_info_bit%
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 0 general general
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 2 %system_info_os% b%system_info_bit%
+call get_variables ..\\config\\downloads.coco downloads download_names downloads_count 3 general b%system_info_bit%
 
-call get_local_text install-process-1
-call get_local_text install-process-2
-call get_local_text install-process-3
-call get_local_text install-process-4
+call get_local_text install_process_s1 install process s1
+call get_local_text install_process_s2 install process s2
+call get_local_text install_process_s3 install process s3
+call get_local_text install_process_s4 install process s4
+call get_local_text install_process_winpath install process winpath
 
-echo !install_process_1!
-echo !install_process_2!
-echo !install_process_3!
-echo !install_process_4!
+echo !install_process_s1!
+echo !install_process_s2!
+echo !install_process_s3!
+echo !install_process_s4!
+echo.
+echo !install_process_winpath!
 
 call print_dashed_seperator
 
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
index fe51a71d1..21c975aaf 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
@@ -1 +1,3 @@
-call run_script .\get_var.ps1 ..\config\config.coco %1
\ No newline at end of file
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\config.coco %1') do (
+	set "%1=%%F"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
index d8c209f16..2f884b366 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
@@ -1,3 +1,3 @@
-call run_script .\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5 %6 > var.tmp
-set /p %1= < var.tmp
-del /q var.tmp
\ No newline at end of file
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\config\\downloads.coco %2 %3 %4 %5') do (
+	set "%1=%%F"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
index 6e4525784..bbcd05b5e 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
@@ -1,3 +1,3 @@
-for /f "delims=" %%a in ('..\\utilities\\get_extension.exe %1 %2') do (
-	%%a
+for /F "delims=" %%F in ('call run_script .\\get_extension.ps1 %1') do (
+	set "%2=%%F"
 )
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
new file mode 100755
index 000000000..631132f74
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
@@ -0,0 +1,18 @@
+$url = ($args[0].ToLower())
+
+if($url.Contains("zip"))
+{
+	Write-Host "zip"
+}
+elseif($url.Contains("exe"))
+{
+	Write-Host "exe"
+}
+elseif($url.Contains("msi"))
+{
+	Write-Host "msi"
+}
+elseif($url.Contains("tar.gz"))
+{
+	Write-Host "tar.gz"
+}
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
index aae9bf110..9a54a78c5 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
@@ -1 +1 @@
-call get_text %language_id% %1 %2 %3 %4 %5
\ No newline at end of file
+call get_text !language_id! %1 %2 %3 %4 %5
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
index 542ffe73c..908399932 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
@@ -16,15 +16,15 @@ if "%version%" == "6.3" ( call:set_os Win7 )
 goto:end
 
 :set_bit
-	call get_local_text install-system-bit
+	call get_local_text install_system_bit install system bit
 	set system_info_bit=%~1
 	echo %system_info_bit%%install_system_bit%
 goto:eof
 
 :set_os
 	set system_info_os=%~1
-	call get_local_text install-system-prefix
-	call get_local_text install-system-sufix
+	call get_local_text install_system_prefix install system prefix
+	call get_local_text install_system_sufix install system sufix
 	echo %install_system_prefix% %system_info_os% %install_system_sufix%
 goto:eof
 
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
index 33f75adf4..aacdf94f2 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
@@ -1,3 +1,3 @@
-call run_script .\get_var.ps1 ..\\localisation\\%1.coco %3 %4 %5 %6 %7 > var.tmp
-set /p %2= < var.tmp
-del /q var.tmp
\ No newline at end of file
+for /F "delims=" %%F in ('call run_script .\\get_var.ps1 ..\\localisation\\%1.coco %3 %4 %5 %6') do (
+	set "%2=%%F"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
index 91da095d5..5e63443fb 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
@@ -1,17 +1,27 @@
 $xml_file = [xml](get-content $args[0])
-if($args.count -eq 3)
+if($args.count -eq 2)
 {
-    cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]))
+    $var_output = ($xml_file.variables.($args[1]))
+}
+elseif($args.count -eq 3)
+{
+    $var_output = ($xml_file.variables.($args[1]).($args[2]))
 }
 elseif($args.count -eq 4)
 {
-    cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3]))
+    $var_output = ($xml_file.variables.($args[1]).($args[2]).($args[3]))
 }
 elseif($args.count -eq 5)
 {
-    cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3]).($args[4]))
+    $var_output = ($xml_file.variables.($args[1]).($args[2]).($args[3]).($args[4]))
 }
 elseif($args.count -eq 6)
 {
-    cmd /c "set_var.bat" ($args[1]) ($xml_file.variables.($args[2]).($args[3]).($args[4]).($args[5]))
-}
\ No newline at end of file
+    $var_output = ($xml_file.variables.($args[1]).($args[2]).($args[3]).($args[4]).($args[5]))
+}
+elseif($args.count -eq 7)
+{
+    $var_output = ($xml_file.variables.($args[1]).($args[2]).($args[3]).($args[4]).($args[5]).($args[6]))
+}
+
+Write-Host "$var_output"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
new file mode 100755
index 000000000..a53805fac
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
@@ -0,0 +1,4 @@
+set count=0
+for /F "delims=" %%F in ('call run_script.bat .\\get_variables.ps1 %*') do (
+	%%F
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1 b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
new file mode 100755
index 000000000..6d94b4324
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
@@ -0,0 +1,33 @@
+$xml_file = [xml](get-content $args[0])
+$arr_value = $args[1]
+$arr_name = $args[2]
+$arr_counter = $args[3]
+$counter = $args[4]
+
+if($args.count -eq 6)
+{
+	$root = $xml_file.variables.($args[5])
+}
+elseif($args.count -eq 7)
+{	
+	$root = $xml_file.variables.($args[5]).($args[6])
+}
+elseif($args.count -eq 8)
+{
+	$root = $xml_file.variables.($args[5]).($args[6]).($args[7])
+}
+elseif($args.count -eq 9)
+{
+	$nodes = $xml_file.variables.($args[5]).($args[6]).($args[7]).($args[8])
+}
+
+foreach ($node in $root.ChildNodes)
+{
+	$counter += 1
+	$value = $node.InnerText
+	$name = $node.Name
+	Write-Host set "$arr_value[$counter]=$value"
+	Write-Host set "$arr_name[$counter]=$name"
+}
+
+Write-Host set "$arr_counter=$counter"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
index 6c8952bc3..e9add16ca 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
@@ -1,10 +1,10 @@
 call print_github_header
 call print_dashed_seperator
 
-call get_local_text github-intro-opensource
-call get_local_text github-intro-online
-call get_local_text github-intro-manual
-call get_local_text github-intro-norec
+call get_local_text github_intro_opensource github intro opensource
+call get_local_text github_intro_online github intro online
+call get_local_text github_intro_manual github intro manual
+call get_local_text github_intro_norec github intro norec
 
 echo !github_intro_opensource!
 echo !github_intro_online!
@@ -13,23 +13,23 @@ echo !github_intro_norec!
 
 call print_dashed_seperator
 
-call get_local_text github-skip-question
+call get_local_text github_skip_question github skip question
 call ask_question "!github_skip_question!"
 call print_dashed_seperator
 
 if "%result%"=="true" (
-	call get_local_text github-skip-consequence
+	call get_local_text github_skip_consequence github skip consequence
 	echo !github_skip_consequence!
 
-	call get_local_text github-skip-donotclose
+	call get_local_text github_skip_donotclose github skip donotclose
 	echo !github_skip_donotclose!
 
-	call get_local_text github-skip-wait
+	call get_local_text github_skip_wait github skip wait
 	set /p "github_skip_wait=!github_skip_wait!"
 
 	call print_dashed_seperator
 
-	call get_local_text github-process-path
+	call get_local_text github_process_path github process path
 	call get_path_safe "!github_process_path!"
 	set "repository_path=!tmp_safe_path!"
 
@@ -39,7 +39,7 @@ if "%result%"=="true" (
 goto:get_bash_path
 
 :get_bash_path
-	call get_local_text github-process-bashi
+	call get_local_text github_process_bashi github process bashi
 	echo !github_process_bashi!
 
 	if not defined install_system_bit (
@@ -49,14 +49,14 @@ goto:get_bash_path
 	)
 
 	if "%system_info_bit%"=="64" (
-		call get_local_text github-process-bashp64
+		call get_local_text github_process_bashp64 github process bashp64
 		echo !github_process_bashp64!
 	) else (
-		call get_local_text github-process-bashp32
+		call get_local_text github_process_bashp32 github process bashp32
 		echo !github_process_bashp32!
 	)
 
-	call get_local_text github-process-bashq
+	call get_local_text github_process_bashq github process bashq
 	set /p "git_bash_path=!github_process_bashq!: "
 
 	if not defined git_bash_path (
@@ -69,7 +69,7 @@ goto:get_bash_path
 	)
 
 	if not exist "%git_bash_path%" (
-		call get_local_text error-exist
+		call get_local_text error_exist error exist
 		echo !error_exist!
 		call print_dashed_seperator
 		goto:get_bash_path
@@ -80,10 +80,10 @@ goto:eof
 
 :get_git_path
 	call print_dashed_seperator
-	call get_local_text github-process-checkout
+	call get_local_text github_process_checkout github process checkout
 	set /p "repository_path=!github_process_checkout!: "
 	if exist !repository_path! (
-		call get_local_text error-path
+		call get_local_text error_path error path
 		call ask_question "!error_path!"
 		if "!result!"=="false" (
 			call print_dashed_seperator
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
index 13e7d3032..1e4797008 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
@@ -1 +1,2 @@
+@echo off
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& "%*"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
index a5e4b61f7..7c137563f 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
@@ -2,7 +2,7 @@
 setlocal EnableDelayedExpansion
 
 Color 0A
-mode con: cols=78 lines=55
+mode con: cols=79 lines=55
 
 call print_header
 call print_dashed_seperator
@@ -14,8 +14,6 @@ echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
 echo v%version% authored by %author% and published by %copyright%.
 call print_seperator
 
-pause
-
 echo Before we start the installation, here are some tips:
 call print_tips
 call print_seperator
@@ -34,32 +32,32 @@ call github_setup
 call print_finished_header
 call print_dashed_seperator
 
-call get_local_text end-succesfull
-call get_local_text end-thankyou
+call get_local_text end_succesfull end succesfull
+call get_local_text end_thankyou end thankyou
 echo %end_succesfull%
 echo %end_thankyou%
 
 call print_dashed_seperator
 
-call get_local_text start-1
-call get_local_text start-2
-call get_local_text start-3
-call get_local_text start-4
-call get_local_text start-5
-call get_local_text start-6
+call get_local_text start_s1 start s1
+call get_local_text start_s2 start s2
+call get_local_text start_s3 start s3
+call get_local_text start_s4 start s4
+call get_local_text start_s5 start s5
+call get_local_text start_s6 start s6
 
-echo !start_1!
-echo !start_2!
+echo !start_s1!
+echo !start_s2!
 echo.
-echo !start_3! '!repository_path!\coco\SCOCODE.bat'
-echo !start_4!
-echo !start_5!
+echo !start_s3! '!repository_path!\coco\SCOCODE.bat'
+echo !start_s4!
+echo !start_s5!
 echo.
-echo !start_6!
+echo !start_s6!
 
 call print_dashed_seperator
 
-call get_local_text end-readme
+call get_local_text end_readme end readme
 call ask_question "!end_readme!"
 
 if "%result%"=="true" (
diff --git a/server/levels/level_handler.coffee b/server/levels/level_handler.coffee
index c58738d20..ad26fe0e1 100644
--- a/server/levels/level_handler.coffee
+++ b/server/levels/level_handler.coffee
@@ -36,6 +36,7 @@ LevelHandler = class LevelHandler extends Handler
     return @getRandomSessionPair(req,res,args[0]) if args[1] is 'random_session_pair'
     return @getLeaderboardFacebookFriends(req, res, args[0]) if args[1] is 'leaderboard_facebook_friends'
     return @getLeaderboardGPlusFriends(req, res, args[0]) if args[1] is 'leaderboard_gplus_friends'
+    return @getHistogramData(req, res, args[0]) if args[1] is 'histogram_data'
     
     return @sendNotFoundError(res)
 
@@ -118,6 +119,18 @@ LevelHandler = class LevelHandler extends Handler
       query = Session.find(sessionQuery).select('-screenshot')
       query.exec (err, results) =>
         if err then @sendDatabaseError(res, err) else @sendSuccess res, results
+          
+  getHistogramData: (req, res,slug) ->
+    query = Session.aggregate [
+      {$match: {"levelID":slug, "submitted": true, "team":req.query.team}}
+      {$project: {totalScore: 1, _id: 0}}
+    ]
+    
+    query.exec (err, data) =>
+      if err? then return @sendDatabaseError res, err
+      valueArray = _.pluck data, "totalScore"
+      @sendSuccess res, valueArray
+    
 
   getLeaderboard: (req, res, id) ->
     sessionsQueryParameters = @makeLeaderboardQueryParameters(req, id)