diff --git a/.gitignore b/.gitignore
index d2d73609a..d2138e7be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ coverage/
 FLOOBITS_README.md
 
 # mongodb
-db/
 bin/node/
 bin/mongo/
 
diff --git a/Vagrantfile b/Vagrantfile
index 6c338e4b8..08a257116 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,17 +4,20 @@
 # Original content copyright (c) 2014 dpen2000 licensed under the MIT license
 
 VAGRANTFILE_API_VERSION = "2"
+Vagrant.require_version ">= 1.5.0"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  # A VMware compatible box is avaliable from:
-  # https://github.com/spkane/vagrant-boxes/releases/download/v1.0.0/trusty64_vmware.box
-  config.vm.box = "ubuntu/trusty64"
+  # Ubuntu 14.04 compatible with both VirtualBox and VMWare Fusion
+  # see https://github.com/phusion/open-vagrant-boxes#readme
+  config.vm.box = "phusion/ubuntu-14.04-amd64"
+
+  config.vm.hostname = "coco-dev"
 
   config.vm.network "forwarded_port", guest: 3000, host: 3000
   config.vm.network "forwarded_port", guest: 9485, host: 9485
 
-  config.vm.provision "shell", path: "scripts/vagrant/provision.sh"
+  config.vm.provision "shell", path: "scripts/vagrant/provision.sh", privileged: false
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 2048
@@ -22,8 +25,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.provider "vmware_fusion" do |v|
-    v.memory = 2048
-    v.cpus = 2
+    v.vmx["memsize"] = "2048"
+    v.vmx["numvcpus"] = 2
   end
 
 end
diff --git a/app/assets/docs/CodeCombatCoursesGettingStartedGuide.pdf b/app/assets/docs/CodeCombatCoursesGettingStartedGuide.pdf
new file mode 100644
index 000000000..97f5b2ddb
Binary files /dev/null and b/app/assets/docs/CodeCombatCoursesGettingStartedGuide.pdf differ
diff --git a/app/assets/images/Adobe_PDF_file_icon_32x32.png b/app/assets/images/Adobe_PDF_file_icon_32x32.png
new file mode 100644
index 000000000..c24f66c04
Binary files /dev/null and b/app/assets/images/Adobe_PDF_file_icon_32x32.png differ
diff --git a/app/assets/images/pages/about/robin_small.png b/app/assets/images/pages/about/robin_small.png
new file mode 100644
index 000000000..c1ce3331a
Binary files /dev/null and b/app/assets/images/pages/about/robin_small.png differ
diff --git a/app/assets/images/pages/sales/chat_icon.png b/app/assets/images/pages/sales/chat_icon.png
new file mode 100644
index 000000000..82cf47824
Binary files /dev/null and b/app/assets/images/pages/sales/chat_icon.png differ
diff --git a/app/assets/images/pages/sales/classroom1.png b/app/assets/images/pages/sales/classroom1.png
new file mode 100644
index 000000000..d742252dc
Binary files /dev/null and b/app/assets/images/pages/sales/classroom1.png differ
diff --git a/app/assets/images/pages/sales/classroom2.png b/app/assets/images/pages/sales/classroom2.png
new file mode 100644
index 000000000..8a2834b52
Binary files /dev/null and b/app/assets/images/pages/sales/classroom2.png differ
diff --git a/app/assets/images/pages/sales/classroom3.png b/app/assets/images/pages/sales/classroom3.png
new file mode 100644
index 000000000..cce4cd068
Binary files /dev/null and b/app/assets/images/pages/sales/classroom3.png differ
diff --git a/app/assets/images/pages/sales/classroom4.png b/app/assets/images/pages/sales/classroom4.png
new file mode 100644
index 000000000..89e75b3fc
Binary files /dev/null and b/app/assets/images/pages/sales/classroom4.png differ
diff --git a/app/assets/images/pages/sales/classroom5.png b/app/assets/images/pages/sales/classroom5.png
new file mode 100644
index 000000000..6de5927cb
Binary files /dev/null and b/app/assets/images/pages/sales/classroom5.png differ
diff --git a/app/assets/images/pages/sales/classroom6.png b/app/assets/images/pages/sales/classroom6.png
new file mode 100644
index 000000000..723d27337
Binary files /dev/null and b/app/assets/images/pages/sales/classroom6.png differ
diff --git a/app/assets/images/pages/sales/content_table.png b/app/assets/images/pages/sales/content_table.png
new file mode 100644
index 000000000..d10574807
Binary files /dev/null and b/app/assets/images/pages/sales/content_table.png differ
diff --git a/app/assets/images/pages/sales/down_arrow.png b/app/assets/images/pages/sales/down_arrow.png
new file mode 100644
index 000000000..2ebe8ef15
Binary files /dev/null and b/app/assets/images/pages/sales/down_arrow.png differ
diff --git a/app/assets/images/pages/sales/hero_background.png b/app/assets/images/pages/sales/hero_background.png
new file mode 100644
index 000000000..1fde05f6a
Binary files /dev/null and b/app/assets/images/pages/sales/hero_background.png differ
diff --git a/app/assets/images/pages/sales/quote1.png b/app/assets/images/pages/sales/quote1.png
new file mode 100644
index 000000000..3aa52f3af
Binary files /dev/null and b/app/assets/images/pages/sales/quote1.png differ
diff --git a/app/assets/images/pages/sales/quote2.png b/app/assets/images/pages/sales/quote2.png
new file mode 100644
index 000000000..19f66af11
Binary files /dev/null and b/app/assets/images/pages/sales/quote2.png differ
diff --git a/app/assets/images/pages/sales/screen1.png b/app/assets/images/pages/sales/screen1.png
new file mode 100644
index 000000000..b778b173a
Binary files /dev/null and b/app/assets/images/pages/sales/screen1.png differ
diff --git a/app/assets/images/pages/sales/screen2.png b/app/assets/images/pages/sales/screen2.png
new file mode 100644
index 000000000..237d7673b
Binary files /dev/null and b/app/assets/images/pages/sales/screen2.png differ
diff --git a/app/assets/images/twitter_icon.png b/app/assets/images/twitter_icon.png
new file mode 100644
index 000000000..61054bd30
Binary files /dev/null and b/app/assets/images/twitter_icon.png differ
diff --git a/app/assets/main.html b/app/assets/main.html
index f799de987..765fe89ce 100644
--- a/app/assets/main.html
+++ b/app/assets/main.html
@@ -27,6 +27,7 @@
   <link href="https://plus.google.com/115285980638641924488" rel="publisher" />
   <link rel="shortcut icon" href="/images/favicon.ico">
   <link rel="stylesheet" href="/stylesheets/app.css">
+  <link href='//fonts.googleapis.com/css?family=Merriweather' rel='stylesheet' type='text/css'>
 
   <!-- Google Analytics -->
   <script>
diff --git a/app/collections/Products.coffee b/app/collections/Products.coffee
new file mode 100644
index 000000000..a68524d67
--- /dev/null
+++ b/app/collections/Products.coffee
@@ -0,0 +1,8 @@
+CocoCollection = require './CocoCollection'
+Product = require 'models/Product'
+
+module.exports = class Products extends CocoCollection
+  model: Product
+  url: '/db/products'
+  
+  getByName: (name) -> @findWhere { name: name }
\ No newline at end of file
diff --git a/app/core/Router.coffee b/app/core/Router.coffee
index 21191dc6e..6e6bcb5df 100644
--- a/app/core/Router.coffee
+++ b/app/core/Router.coffee
@@ -20,18 +20,13 @@ module.exports = class CocoRouter extends Backbone.Router
     'account': go('account/MainAccountView')
     'account/settings': go('account/AccountSettingsRootView')
     'account/unsubscribe': go('account/UnsubscribeView')
-    #'account/profile': go('user/JobProfileView')  # legacy URL, sent in emails
-    'account/profile': go('EmployersView')  # Show the not-recruiting-now screen
     'account/payments': go('account/PaymentsView')
     'account/subscription': go('account/SubscriptionView')
-    'account/subscription/sale': go('account/SubscriptionSaleView')
     'account/invoices': go('account/InvoicesView')
     'account/prepaid': go('account/PrepaidView')
 
     'admin': go('admin/MainAdminView')
-    'admin/candidates': go('admin/CandidatesView')
     'admin/clas': go('admin/CLAsView')
-    'admin/employers': go('admin/EmployersListView')
     'admin/files': go('admin/FilesView')
     'admin/analytics': go('admin/AnalyticsView')
     'admin/analytics/subscriptions': go('admin/AnalyticsSubscriptionsView')
@@ -62,9 +57,6 @@ module.exports = class CocoRouter extends Backbone.Router
     'contribute/diplomat': go('contribute/DiplomatView')
     'contribute/scribe': go('contribute/ScribeView')
 
-    'courses/mock1': go('courses/mock1/CoursesView')
-    'courses/mock1/enroll/:courseID': go('courses/mock1/CourseEnrollView')
-    'courses/mock1/:courseID': go('courses/mock1/CourseDetailsView')
     'courses': go('courses/CoursesView')
     'Courses': go('courses/CoursesView')
     'courses/students': go('courses/StudentCoursesView')
@@ -93,8 +85,7 @@ module.exports = class CocoRouter extends Backbone.Router
     'editor/campaign/:campaignID': go('editor/campaign/CampaignEditorView')
     'editor/poll': go('editor/poll/PollSearchView')
     'editor/poll/:articleID': go('editor/poll/PollEditView')
-
-    'employers': go('EmployersView')
+    'editor/thang-tasks': go('editor/ThangTasksView')
 
     'file/*path': 'routeToServer'
 
@@ -126,14 +117,14 @@ module.exports = class CocoRouter extends Backbone.Router
 
     'preview': go('HomeView')
 
+    'schools': go('SalesView')
+
     'teachers': go('TeachersView')
     'teachers/freetrial': go('TeachersFreeTrialView')
 
     'test(/*subpath)': go('TestView')
 
     'user/:slugOrID': go('user/MainUserView')
-    #'user/:slugOrID/profile': go('user/JobProfileView')
-    'user/:slugOrID/profile': go('EmployersView')  # Show the not-recruiting-now screen
 
     '*name/': 'removeTrailingSlash'
     '*name': go('NotFoundView')
diff --git a/app/core/auth.coffee b/app/core/auth.coffee
index 187ea5b99..b467e4117 100644
--- a/app/core/auth.coffee
+++ b/app/core/auth.coffee
@@ -51,7 +51,11 @@ module.exports.loginUser = (userObject, failure=genericFailure, nextURL=null) ->
 module.exports.logoutUser = ->
   FB?.logout?()
   callback = ->
-    window.location = '/hoc'
+    location = _.result(currentView, 'logoutRedirectURL')
+    if location
+      window.location = location
+    else
+      window.location.reload()
   res = $.post('/auth/logout', {}, callback)
   res.fail(genericFailure)
 
diff --git a/app/core/treema-ext.coffee b/app/core/treema-ext.coffee
index a4c147d4b..7f1204181 100644
--- a/app/core/treema-ext.coffee
+++ b/app/core/treema-ext.coffee
@@ -240,6 +240,7 @@ codeLanguages =
   python: 'ace/mode/python'
   clojure: 'ace/mode/clojure'
   lua: 'ace/mode/lua'
+  java: 'ace/mode/java'
   io: 'ace/mode/text'
 
 class CodeLanguagesObjectTreema extends TreemaNode.nodeMap.object
@@ -256,7 +257,9 @@ class CodeTreema extends TreemaNode.nodeMap.ace
   constructor: ->
     super(arguments...)
     @workingSchema.aceTabSize = 4
-    @workingSchema.aceMode ?= mode if mode = codeLanguages[@keyForParent]
+    # TODO: Find a less hacky solution for this
+    @workingSchema.aceMode = mode if mode = codeLanguages[@keyForParent]
+    @workingSchema.aceMode = mode if mode = codeLanguages[@parent?.data?.language]
 
 class CoffeeTreema extends CodeTreema
   constructor: ->
diff --git a/app/core/utils.coffee b/app/core/utils.coffee
index 938c8c1f6..6566bbb89 100644
--- a/app/core/utils.coffee
+++ b/app/core/utils.coffee
@@ -244,7 +244,7 @@ module.exports.getCoursePraise = getCoursePraise = ->
   ]
   praise[_.random(0, praise.length - 1)]
 
-module.exports.getPrepaidCodeAmount = getPrepaidCodeAmount = (price=999, users=0, months=0) ->
+module.exports.getPrepaidCodeAmount = getPrepaidCodeAmount = (price=0, users=0, months=0) ->
   return 0 unless users > 0 and months > 0
   total = price * users * months
   total
@@ -252,7 +252,7 @@ module.exports.getPrepaidCodeAmount = getPrepaidCodeAmount = (price=999, users=0
 module.exports.filterMarkdownCodeLanguages = (text) ->
   return '' unless text
   currentLanguage = me.get('aceConfig')?.language or 'python'
-  excludedLanguages = _.without ['javascript', 'python', 'coffeescript', 'clojure', 'lua', 'io'], currentLanguage
+  excludedLanguages = _.without ['javascript', 'python', 'coffeescript', 'clojure', 'lua', 'java', 'io'], currentLanguage
   exclusionRegex = new RegExp "```(#{excludedLanguages.join('|')})\n[^`]+```\n?", 'gm'
   text.replace exclusionRegex, ''
 
@@ -260,9 +260,11 @@ module.exports.aceEditModes = aceEditModes =
   'javascript': 'ace/mode/javascript'
   'coffeescript': 'ace/mode/coffee'
   'python': 'ace/mode/python'
+  'java': 'ace/mode/java'
   'clojure': 'ace/mode/clojure'
   'lua': 'ace/mode/lua'
   'io': 'ace/mode/text'
+  'java': 'ace/mode/java'
 
 module.exports.initializeACE = (el, codeLanguage) ->
   contents = $(el).text().trim()
diff --git a/app/lib/LevelBus.coffee b/app/lib/LevelBus.coffee
index 80ee73229..2a796cb12 100644
--- a/app/lib/LevelBus.coffee
+++ b/app/lib/LevelBus.coffee
@@ -28,7 +28,7 @@ module.exports = class LevelBus extends Bus
   constructor: ->
     super(arguments...)
     @changedSessionProperties = {}
-    highLoad = true
+    highLoad = false
     [wait, maxWait] = switch
       when not application.isProduction() then [1, 5]  # Save quickly in development.
       when not highLoad then [4, 10]                   # Save slowly when in production.
diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee
index 84ed7fe45..b93a02306 100644
--- a/app/lib/LevelLoader.coffee
+++ b/app/lib/LevelLoader.coffee
@@ -245,7 +245,7 @@ module.exports = class LevelLoader extends CocoClass
     if extantRequiredThangTypes.length < requiredThangTypes.length
       console.error "Some Thang had a blank required ThangType in components list:", components
     for thangType in extantRequiredThangTypes
-      url = "/db/thang.type/#{thangType}/version?project=name,components,original,rasterIcon,kind"
+      url = "/db/thang.type/#{thangType}/version?project=name,components,original,rasterIcon,kind,prerenderedSpriteSheetData"
       @worldNecessities.push @maybeLoadURL(url, ThangType, 'thang')
 
   onThangNamesLoaded: (thangNames) ->
diff --git a/app/lib/simulator/Simulator.coffee b/app/lib/simulator/Simulator.coffee
index d17ea91bc..3250d716c 100644
--- a/app/lib/simulator/Simulator.coffee
+++ b/app/lib/simulator/Simulator.coffee
@@ -59,6 +59,7 @@ module.exports = class Simulator extends CocoClass
       success: (taskData) =>
         return if @destroyed
         unless taskData
+          @retryDelayInSeconds = 10
           @trigger 'statusUpdate', "No games to simulate. Trying another game in #{@retryDelayInSeconds} seconds."
           @simulateAnotherTaskAfterDelay()
           return
diff --git a/app/lib/sprites/SpriteBuilder.coffee b/app/lib/sprites/SpriteBuilder.coffee
index 43c967c4a..3329a27d3 100644
--- a/app/lib/sprites/SpriteBuilder.coffee
+++ b/app/lib/sprites/SpriteBuilder.coffee
@@ -128,6 +128,7 @@ module.exports = class SpriteBuilder
     @colorMap = {}
     colorGroups = @thangType.get('colorGroups')
     return if _.isEmpty colorGroups
+    return unless _.size @shapeStore  # We don't have the shapes loaded because we are doing a prerendered spritesheet approach
     colorConfig = @options.colorConfig
 #    colorConfig ?= {team: {hue:0.4, saturation: -0.5, lightness: -0.5}} # test config
     return if not colorConfig
diff --git a/app/lib/surface/LayerAdapter.coffee b/app/lib/surface/LayerAdapter.coffee
index c7a380a63..52569ac7f 100644
--- a/app/lib/surface/LayerAdapter.coffee
+++ b/app/lib/surface/LayerAdapter.coffee
@@ -151,7 +151,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
     lank.layer = @
     @listenTo(lank, 'action-needs-render', @onActionNeedsRender)
     @lanks.push lank
-    lank.thangType.initPrerenderedSpriteSheets()
+    lank.thangType.initPrerenderedSpriteSheets() unless currentView.getQueryVariable 'jitSpritesheets'
     prerenderedSpriteSheet = lank.thangType.getPrerenderedSpriteSheet(lank.options.colorConfig, @defaultSpriteType)
     prerenderedSpriteSheet?.markToLoad()
     @loadThangType(lank.thangType)
@@ -273,6 +273,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
         builder.buildAsync()
       catch e
         @resolutionFactor *= 0.9
+        #console.log "  Rerendering sprite sheet didn't fit, going down to resolutionFactor", @resolutionFactor, "async", async
         return @_renderNewSpriteSheet(async)
       builder.on 'complete', @onBuildSpriteSheetComplete, @, true, builder
       @asyncBuilder = builder
@@ -290,7 +291,8 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
       # get a rough estimate of how much smaller the spritesheet needs to be
       for image, index in builder.spriteSheet._images
         total += image.height / builder.maxHeight
-      @resolutionFactor /= (Math.max(1.1, Math.sqrt(total)))
+      @resolutionFactor /= (Math.max(1.25, Math.sqrt(total)))
+      #console.log "#{@name} rerendering new sprite sheet with resolutionFactor", @resolutionFactor, "async", e.async
       @_renderNewSpriteSheet(e.async)
       return
 
@@ -357,6 +359,7 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
     if prerenderedSpriteSheet and not prerenderedSpriteSheet.loadedImage
       return
     containersToRender = thangType.getContainersForActions(actionNames)
+    #console.log 'render segmented', thangType.get('name'), actionNames, colorConfig, 'because we do not have prerendered sprite sheet?', prerenderedSpriteSheet
     spriteBuilder = new SpriteBuilder(thangType, {colorConfig: colorConfig})
     for containerGlobalName in containersToRender
       containerKey = @renderGroupingKey(thangType, containerGlobalName, colorConfig)
@@ -387,6 +390,8 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
         sprite = new createjs.Sprite(prerenderedSpriteSheet.spriteSheet)
         sprite.gotoAndStop(i)
         prerenderedFramesMap[i] = spriteSheetBuilder.addFrame(sprite, null, scale)
+    #else
+    #  console.log '    Rerendering singular thang type', thangType.get('name'), thangType.get('spriteType'), colorConfig, actionNames
 
     actionObjects = _.values(thangType.getActions())
     animationActions = []
diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index eb8614a5b..335720934 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     multiplayer: "متعدد اللاعبين" # Not currently shown on home page
     for_developers: "للمطوّرين" # Not currently shown on home page.
     or_ipad: "أو حمِّل من أجل الآيباد"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "إلعب" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     creating: "جاري إنساء الحساب..."
     sign_up: "التسجيل"
     log_in: "تسجيل الدّخول بكلمة السرّ"
-    social_signup: "أو، يمكنك الاشتراك من خلال الفايسبوك  أو جوجل+"
     required: "تحتاج إلى تسجيل الدخول قبل أن تتمكن من السير في هذا الطريق."
     login_switch: "لديك حساب بالفعل?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     incomplete: "غير مكتمل"
     timed_out: "تم انتهاء الوقت"
     failing: "فشل"
-    action_timeline: "عمل الجدول الزمني"
-    click_to_select: "انقر على وحدة لتحديده."
     control_bar_multiplayer: "متعددة"
     control_bar_join_game: "تاريخ لعبة"
     reload: "تحديث"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "إرسال تعليقات"
-    contact_candidate: "الاتصال المرشح" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "إعدادات الحساب"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 2105389d2..cd08c0899 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "български език", englishDescri
     multiplayer: "Мултиплейър" # Not currently shown on home page
     for_developers: "За разработчици" # Not currently shown on home page.
     or_ipad: "Или свали за iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Нива" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "български език", englishDescri
     creating: "Създаване на профил..."
     sign_up: "Регистриране"
     log_in: "Вход с парола"
-    social_signup: "Или, можеш да се регистрираш през Facebook или G+:"
     required: "Трабва да влезеш преди можеш да ходиш на там."
     login_switch: "Вече имаш акаунт?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "български език", englishDescri
     incomplete: "Недовършен"
     timed_out: "Времето изтече"
     failing: "Неуспех"
-    action_timeline: "График на действията"
-    click_to_select: "Кликни на нещото за да го избереш."
     control_bar_multiplayer: "Мултиплейър"
     control_bar_join_game: "Присъединяване"
     reload: "Презареди"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "български език", englishDescri
     parents_title: "Скъпи Родители: Вашето дете се учи да програмира. Ще му помогнете ли да продължи?"
     parents_blurb1: "Вашето дете изигра __nLevels__ нива и получи основни познания в програмирането. Развийте интереса в него като му купите абонамент - така то ще може да продължи с игрите."
     parents_blurb1a: "Програмирането е важно умение което без съмнение вашето дете ще използва когато порасне. До 2020-та, основни познания по програмиране ще са необходими за повече от 77% от работните места, а софтуерните инженери ще са много търсени по света. Знаете ли, че диплома в сферата на информационните технологии е предпоставка за едни от най-високите заплати в индустрията?"
-    parents_blurb2: "За $9.99 USD/месец, вашето дете ще получава нови задачи всяка седмица, както и персонална помощ по електронната поща от професионални програмисти."
+    parents_blurb2: "За ${{price}} USD/месец, вашето дете ще получава нови задачи всяка седмица, както и персонална помощ по електронната поща от професионални програмисти."
     parents_blurb3: "Без Риск: 100% гаранция за възстановяване на средствата, прекратяване на абонамента с едно натискане на бутон."
     payment_methods: "Начини на плащане"
     payment_methods_title: "Възможни начини на плащане"
     payment_methods_blurb1: "В момента приемаме кредитни карти и Alipay." # {change}
     payment_methods_blurb2: "Ако желаете алтернативна форма на плащане, свържете се с нас"
-    sale_already_subscribed: "Вече имате абонамент!"
-    sale_blurb1: "Спестете $21" # {change}
-    sale_blurb2: "от редовната абонаментна такса от $120 за цялата година!"
     sale_button: "Разпродажба!"
-    sale_button_title: "Спестете $21 като направите абонамент за 1 година" # {change}
-    sale_click_here: "Кликнете Тук"
-    sale_ends: "Завършва"
-    sale_extended: "*Съществуващият абонамент ще бъде продължен с 1 година."
-    sale_feature_here: "Ето какво получавате:"
-    sale_feature2: "Достъп до 9 силни <strong>нови герои</strong> с уникални умения!"
-    sale_feature4: "<strong>42,000 скъпоценни камъни бонус</strong> присъдени веднага!"
-    sale_continue: "Готови ли сте да продължите приключението?"
-    sale_limited_time: "Офертата е достъпна за ограничен период от време!"
-    sale_new_heroes: "Нови герои!"
-    sale_title: "Назад към Училищната Разпродажба"
-    sale_view_button: "Купи едногодишен абонамент за"
+    sale_button_title: "Спестете ${{discount}} като направите абонамент за 1 година" # {change}
     stripe_description: "Месечен Абонамент"
-    stripe_description_year_sale: "Едногодишен абонамент ($21 намаление)" # {change}
+    stripe_description_year_sale: "Едногодишен абонамент (${{discount}} намаление)" # {change}
     subscription_required_to_play: "Необходим ви е абонамент за да играете това ниво."
     unlock_help_videos: "Абонирайте се за да отключите всичките видео уроци."
     personal_sub: "Персонален абонамент" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "български език", englishDescri
     currently_free_until: "В момента имате абонамент до"
     was_free_until: "Имали сте безплатен абонамент до"
     managed_subs: "Управлявани Абонаменти"
-    managed_subs_desc: "Добавете абонаменти на други играчи (студенти, деца и т.н.)"
-    managed_subs_desc_2: "Получателите трябва да имат CodeCombat акаунт, асоцииран с email адреса, който предоставяте."
-    group_discounts: "Групови намаления"
-    group_discounts_1: "Също предлагаме специални намаления за групово абониране."
-    group_discounts_1st: "Първи абонамент"
-    group_discounts_full: "Пълната цена"
-    group_discounts_2nd: "Абонаменти 2-11"
-    group_discounts_20: "20% намаление"
-    group_discounts_12th: "Абонаменти 12+"
-    group_discounts_40: "40% намаление"
     subscribing: "Абониране..."
-    recipient_emails_placeholder: "Въведете email адресите на абонатите, по един на ред."
-    subscribe_users: "Абониране на потребители"
-    users_subscribed: "Абонирани потребители:"
-    no_users_subscribed: "Няма абонирани потребители, моля проверете email адресите отново."
     current_recipients: "Текущи получатели"
     unsubscribing: "Прекратяване на абонамента..." # {change}
     subscribe_prepaid: "Кликнете 'Абонамент', за да използвате предплатен код"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "български език", englishDescri
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "български език", englishDescri
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index a37fc7b1c..0f3f967c9 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -4,7 +4,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     no_ie: "CodeCombat no funciona en Internet Explorer 8 o versions anteriors. Perdó!" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat no ha estat dissenyat per dispositius mòbils i per tant no funcionarà!" # Warning that shows up on mobile devices
     play: "Jugar" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Juga a la versió campanya" # Shows up under big play button if you only play /courses
     old_browser: "Uh oh, el teu navegador és massa antic per fer funcionar CodeCombat. Perdó!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Pots probar-ho igualment, però el més segur és que no funcioni."
     ipad_browser: "Males notícies: CodeCombat no funciona en el navegador d'iPad. Bones notícies: la nostre aplicació d'iPad està esperant l'aprovació d'Apple."
@@ -12,17 +12,14 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     for_beginners: "Per a principiants"
     multiplayer: "Multijugador" # Not currently shown on home page
     for_developers: "Per a Desenvolupadors" # Not currently shown on home page.
-    or_ipad: "O descarrèga'l per iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
+    or_ipad: "O descarrega'l per iPad"
 
   nav:
     play: "Nivells" # The top nav bar entry where players choose which levels to play
     community: "Comunitat"
-#    courses: "Courses"
+    courses: "Cursos"
     editor: "Editor"
-    blog: "Blog"
+    blog: "Bloc"
     forum: "Fòrum"
     account: "Compte"
     profile: "Perfil"
@@ -35,30 +32,30 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     about: "Sobre Nosaltres"
     contact: "Contacta"
     twitter_follow: "Segueix-nos"
-    teachers: "Profesors"
-#    careers: "Careers"
+    teachers: "Professors"
+    careers: "Professions"
 
   modal:
     close: "Tancar"
-    okay: "Okey"
+    okay: "D'acord"
 
   not_found:
-    page_not_found: "Pagina no trobada"
+    page_not_found: "Pàgina no trobada"
 
   diplomat_suggestion:
     title: "Ajuda a traduir CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "Neccesitem les teves habilitats lingüístiques."
-    pitch_body: "Hem desenvolupat CodeCombat en anglès, peró tenim jugadors per tot el món. Molts d'ells volen jugar en Català, però no parlen anglès, per tant si pots parlar ambdós llengües, siusplau considereu iniciar sesió per a ser Diplomàtic i ajudar a traduir la web de CodeCombat i tots els seus nivell en Català."
+    pitch_body: "Hem desenvolupat CodeCombat en anglès, però tenim jugadors per tot el món. Molts d'ells volen jugar en Català, però no parlen anglès, per tant si pots parlar ambdues llengües, siusplau considereu iniciar sessió per a ser Diplomàtic i ajudar a traduir la web de CodeCombat i tots els seus nivells en Català."
     missing_translations: "Fins que puguem traduir-ho tot en català, ho veuràs en anglès quant no estigui en català."
     learn_more: "Aprèn més sobre ser un diplomàtic"
     subscribe_as_diplomat: "Subscriu-te com a diplomàtic"
 
   play:
     play_as: "Jugar com" # Ladder page
-#    compete: "Compete!" # Course details page
-    spectate: "Spectate" # Ladder page
-    players: "jugadors" # Hover over a level on /play
-    hours_played: "hores de joc" # Hover over a level on /play
+    compete: "Competir!" # Course details page
+    spectate: "Espectador" # Ladder page
+    players: "Jugadors" # Hover over a level on /play
+    hours_played: "Hores jugades" # Hover over a level on /play
     items: "Objectes" # Tooltip on item shop button from /play
     unlock: "Desbloquejar" # For purchasing items and heroes
     confirm: "Confirmar"
@@ -71,31 +68,31 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     achievements: "Triomfs" # Tooltip on achievement list button from /play
     account: "Compte" # Tooltip on account button from /play
     settings: "Configuració" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "Enquesta" # Tooltip on poll button from /play
     next: "Següent" # Go from choose hero to choose inventory before playing a level
     change_hero: "Canviar heroi" # Go back from choose inventory to choose hero
     buy_gems: "Comprar Gemes"
     subscription_required: "Subscripció necessària"
     anonymous: "Jugador anònim"
     level_difficulty: "Dificultat: "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Juga a la versió de classe" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Campanya del principiant"
     awaiting_levels_adventurer_prefix: "Fem cinc nivells per setmana" # {change}
-    awaiting_levels_adventurer: "Inicia sessió com aventurer"
-    awaiting_levels_adventurer_suffix: "sigues el primer en jugar els nous nivells"
+    awaiting_levels_adventurer: "Inicia sessió com a aventurer"
+    awaiting_levels_adventurer_suffix: "Sigues el primer en jugar els nous nivells"
     adjust_volume: "Ajustar volum"
     campaign_multiplayer: "Arenes Multijugador"
     campaign_multiplayer_description: "... on programes cara a cara contra altres jugadors."
-#    campaign_old_multiplayer: "(Deprecated) Old Multiplayer Arenas"
-#    campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas."
+    campaign_old_multiplayer: "(Obsolet) Arenes multijugador antigues"
+    campaign_old_multiplayer_description: "Relíquies d'una era més civilitzada. No hi ha simulacions per aquestes arenes multijugador antigues."
 
   share_progress_modal:
     blurb: "Estàs progressant molt! Digues a algú quan n'has après amb CodeCombat." # {change}
-    email_invalid: "Correu electrònic invalid."
+    email_invalid: "Correu electrònic invàlid."
     form_blurb: "Escriu els seus emails a sota i els hi ensenyarem!"
     form_label: "Correu electrònic"
     placeholder: "adreça de correu electrònic"
-    title: "Excelent feina, Aprenent"
+    title: "Excel·lent feina, aprenent"
 
   login:
     sign_up: "Crear un compte"
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     creating: "Creant Compte..."
     sign_up: "Registrar-se"
     log_in: "Iniciar sessió amb la teva contrasenya"
-    social_signup: "O, pots iniciar sessió desde Facebook o G+:"
     required: "Neccesites iniciar sessió abans ."
     login_switch: "Ja tens un compte?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "Nom de l'institut i ciutat"
+    optional: "opcional"
+    school_name_placeholder: "Exemple: IES Mossèn Alcover, Manacor"
 
   recover:
     recover_account_title: "Recuperar Compte"
@@ -156,7 +152,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     unwatch: "Amaga"
     submit_patch: "Enviar pegat"
     submit_changes: "Puja canvis"
-#    save_changes: "Save Changes"
+    save_changes: "Guarda canvis"
 
   general:
     and: "i"
@@ -168,15 +164,15 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     accepted: "Acceptat"
     rejected: "Rebutjat"
     withdrawn: "Retirat"
-#    accept: "Accept"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    accept: "Accepta"
+    reject: "Refusa"
+    withdraw: "Retira"
     submitter: "Remitent"
     submitted: "Presentat"
-    commit_msg: "nissatge de Commir"
+    commit_msg: "Enviar missatge"
     version_history: "Historial de versions"
     version_history_for: "Historial de versions per: "
-    select_changes: "Seleciona dos canvis sota per veure les diferencies."
+    select_changes: "Selecciona dos canvis de sota per veure les diferències."
     undo_prefix: "Desfer"
     undo_shortcut: "(Ctrl+Z)"
     redo_prefix: "Refés"
@@ -186,8 +182,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     results: "Resultats"
     description: "Descripció"
     or: "o"
-    subject: "Subjecte"
-    email: "Email"
+    subject: "Tema"
+    email: "Correu electrònic"
     password: "Contrasenya"
     message: "Missatge"
     code: "Codi"
@@ -205,7 +201,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     player: "Jugador"
     player_level: "Nivell" # Like player level 5, not like level: Dungeons of Kithgard
     warrior: "Guerrer"
-    ranger: "Ranger"
+    ranger: "Guardabosc"
     wizard: "Mag"
 
   units:
@@ -225,143 +221,141 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     years: "anys"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "Nivell completat:"
+    course: "Curs:"
     done: "Fet"
-#    next_level: "Next Level:"
-#    next_game: "Next game"
-#    show_menu: "Show game menu"
+    next_level: "Següent nivell:"
+    next_game: "Següent joc"
+    show_menu: "Mostrar menú del joc"
     home: "Inici" # Not used any more, will be removed soon.
     level: "Nivell" # Like "Level: Dungeons of Kithgard"
     skip: "Ometre"
-    game_menu: "Menu de joc"
+    game_menu: "Menú de joc"
     guide: "Guia"
-    restart: "Recomençar"
+    restart: "Reiniciar"
     goals: "Objectius"
     goal: "Objectiu"
     running: "Executant..."
-    success: "Exit!"
+    success: "Èxit!"
     incomplete: "Incomplet"
     timed_out: "S'ha acabat el temps"
     failing: "Fallant"
-    action_timeline: "Cronologia d'accions"
-    click_to_select: "Fes clic a una unitat per seleccionar-la"
     control_bar_multiplayer: "Multijugador"
     control_bar_join_game: "Entrar al joc"
     reload: "Recarregar"
     reload_title: "Recarregar tot el codi?"
-    reload_really: "Estàs segur que vos recarregar aquest nivell al principi?"
+    reload_really: "Estàs segur que vols recarregar aquest nivell des del principi?"
     reload_confirm: "Recarregar tot"
     victory: "Victòria"
     victory_title_prefix: ""
     victory_title_suffix: " Complet"
     victory_sign_up: "Inicia sessió per a desar el progressos"
-    victory_sign_up_poke: "Vols guardar el teu codi? Crea un compte gratuit!"
+    victory_sign_up_poke: "Vols guardar el teu codi? Crea un compte gratuït!"
     victory_rate_the_level: "Valora el nivell: " # {change}
     victory_return_to_ladder: "Retorna a les Escales"
     victory_saving_progress: "Desa progrés"
     victory_go_home: "Tornar a l'inici"
-    victory_review: "Diguens més!"
-#    victory_review_placeholder: "How was the level?"
+    victory_review: "Explica'ns més!"
+    victory_review_placeholder: "Com ha anat el nivell?"
     victory_hour_of_code_done: "Has acabat?"
-    victory_hour_of_code_done_yes: "Sí, He acabat amb la meva Hora de Codi™!"
+    victory_hour_of_code_done_yes: "Sí, he acabat amb la meva Hora del Codi™!"
     victory_experience_gained: "XP Guanyada"
     victory_gems_gained: "Gemmes guanyades"
-#    victory_new_item: "New Item"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_new_item: "Objecte nou"
+    victory_viking_code_school: "Ostres! Aquest nivell era un nivell difícil de superar! Si no ets un programador, ho hauries de ser. Acabes d'aconseguir una acceptació per la via ràpida a l'Escola de Programació Vikinga, on pot millorar les teves habilitats fins al següent nivell i esdevenir un programador de webs professional en 14 setmanes."
+    victory_become_a_viking: "Converteix-te en un víking"
     guide_title: "Guia"
     tome_cast_button_run: "Executar"
     tome_cast_button_running: "Executant"
     tome_cast_button_ran: "Executat"
     tome_submit_button: "Envia"
-    tome_reload_method: "Recarrega el codi original code per aquest metòde" # Title text for individual method reload button.
+    tome_reload_method: "Recarrega el codi original per aquest metòde" # Title text for individual method reload button.
     tome_select_method: "Selecciona un mètode"
     tome_see_all_methods: "Veure tots els mètodes que pots editar" # Title text for method list selector (shown when there are multiple programmable methods).
-    tome_select_a_thang: "Selecciona Algú Per"
+    tome_select_a_thang: "Selecciona algú Per"
     tome_available_spells: "Encanteris disponibles"
     tome_your_skills: "Les teves habilitats"
     tome_current_method: "Mètode actual"
     code_saved: "Codi Guardat"
-    skip_tutorial: "Passar (esc)"
+    skip_tutorial: "Ometre (esc)"
     keyboard_shortcuts: "Dreceres del teclat"
     loading_ready: "Preparat!"
     loading_start: "Comença el nivell"
     problem_alert_title: "Arregla el Teu Codi"
     time_current: "Ara:"
-    time_total: "Maxim:"
+    time_total: "Màxim:"
     time_goto: "Ves a:"
-#    non_user_code_problem_title: "Unable to Load Level"
-#    infinite_loop_title: "Infinite Loop Detected"
-#    infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
-#    check_dev_console: "You can also open the developer console to see what might be going wrong."
-#    check_dev_console_link: "(instructions)"
+    non_user_code_problem_title: "Impossible carregar el nivell"
+    infinite_loop_title: "Detectat un bucle infinit"
+    infinite_loop_description: "El codi inicial mai acaba d'executar-se. Probablement sigui molt lent o tingui un bucle infinit. O pot ser un error. Pots provar de tornar a executar el codi o reiniciar-lo al seu estat original. Si no es soluciona, si us plau, fes-nos-ho saber."
+    check_dev_console: "També pots obrir la consola de desenvolupament per veure què surt malament."
+    check_dev_console_link: "(instruccions)"
     infinite_loop_try_again: "Tornar a intentar"
     infinite_loop_reset_level: "Reiniciar nivell"
-    infinite_loop_comment_out: "Descommenta el Meu Codi"
+    infinite_loop_comment_out: "Treu els comentaris del meu codi"
     tip_toggle_play: "Canvia entre reproduir/pausa amb Ctrl+P"
     tip_scrub_shortcut: "Ctrl+[ i Ctrl+] per rebobinar i avançar" # {change}
-#    tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
+    tip_guide_exists: "Clica a la guia dins el menú del joc (a la part superior de la pàgina) per informació útil."
     tip_open_source: "CodeCombat és 100% codi lliure!"
-#    tip_tell_friends: "Enjoying CodeCombat? Tell your friends about us!"
+    tip_tell_friends: "Gaudint de CodeCombat? Explica'ls-ho als teus amics!"
     tip_beta_launch: "CodeCombat va llançar la seva beta l'octubre de 2013."
-    tip_think_solution: "Pensa en la solució,no en el problema."
+    tip_think_solution: "Pensa en la solució, no en el problema."
     tip_theory_practice: "En teoria no hi ha diferència entre la teoria i la pràctica. Però a la pràctica si que n'hi ha. - Yogi Berra"
     tip_error_free: "Només hi ha dues maneres d'escriure programes sense errors; la tercera és la única que funciona. - Alan Perlis"
-    tip_debugging_program: "Si debuguejar és el procés d'eliminar errors, llavors programar és el procés de posar-los. - Edsger W. Dijkstra"
-#    tip_forums: "Head over to the forums and tell us what you think!"
-    tip_baby_coders: "En el futur fins i tot els bebés podran ser Artximags."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
-#    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    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: "Hi ha 10 tipus de persones al mon, les que saben programar en binari i les que no"
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - 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_hardware_problem: "Q: How many programmers does it take to change a light bulb?  A: None, it's a hardware problem."
-#    tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law."
-#    tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth"
-#    tip_brute_force: "When in doubt, use brute force. - Ken Thompson"
-#    tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..."
-#    tip_superpower: "Coding is the closest thing we have to a superpower."
-#    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
-#    tip_no_code: "No code is faster than no code."
-#    tip_code_never_lies: "Code never lies, comments sometimes do. — Ron Jeffries"
-#    tip_reusable_software: "Before software can be reusable it first has to be usable."
-#    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
-#    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-#    tip_source_code: "I want to change the world but they would not give me the source code."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
-#    tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-#    tip_google: "Have a problem you can't solve? Google it!"
-#    tip_adding_evil: "Adding a pinch of evil."
-#    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
-#    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_debugging_program: "Si depurar és el procés per eliminar errors, llavors programar és el procés de posar-los. - Edsger W. Dijkstra"
+    tip_forums: "Passa pels fòrums i digues el que penses!"
+    tip_baby_coders: "En el futur fins i tot els nadons podran ser mags."
+    tip_morale_improves: "La càrrega continuarà fins que la moral millori."
+    tip_all_species: "Creiem en la igualtat d'oportunitats per aprendre a programar per a totes les espècies."
+    tip_reticulating: "Reticulant punxes."
+    tip_harry: "Ets un bruixot, "
+    tip_great_responsibility: "Un gran coneixement del codi comporta una gran responsabilitat per a depurar-lo."
+    tip_munchkin: "Si no menges les teves verdures, un munchkin vindrà mentre dormis."
+    tip_binary: "Hi ha 10 tipus de persones al món, les que saben programar en binari i les que no"
+    tip_commitment_yoda: "Un programador ha de tenir un compromís profund, una ment seriosa. ~ Yoda"
+    tip_no_try: "Fes-ho. O no ho facis. Però no ho intentis. - Yoda"
+    tip_patience: "Pacient has de ser, jove Padawan. - Yoda"
+    tip_documented_bug: "Un error documentat no és un error; és un atractiu."
+    tip_impossible: "Sempre sembla impossible fins que es fa. - Nelson Mandela"
+    tip_talk_is_cheap: "Parlar és barat. Mostra'm el codi. - Linus Torvalds"
+    tip_first_language: "La cosa més desastrosa que aprendràs mai és el teu primer llenguatge de programació. - Alan Kay"
+    tip_hardware_problem: "P: Quants programadors són necessaris per canviar una bombeta?  R: Cap, és un problema de hardware."
+    tip_hofstadters_law: "Llei de Hofstadter: Sempre et portarà més feina del que esperaves, fins i tot tenint en compte la llei de Hofstadter."
+    tip_premature_optimization: "La optimització prematura és l'arrel de la maldat. - Donald Knuth"
+    tip_brute_force: "Quan dubtis, usa força bruta. - Ken Thompson"
+    tip_extrapolation: "Hi ha dos tipus de persones: aquells que poden extrapolar des de dades incompletes..."
+    tip_superpower: "Programar és el que més s'aproxima a un super poder."
+    tip_control_destiny: "En un codi obert real tens el dret a controlar el teu propi destí. - Linus Torvalds"
+    tip_no_code: "Cap codi és més ràpid que l'absència de codi."
+    tip_code_never_lies: "El codi mai menteix, els comentaris a vegades. — Ron Jeffries"
+    tip_reusable_software: "Abans que el codi sigui reutilitzable, ha de ser usable."
+    tip_optimization_operator: "Cada llenguatge té un operador d'optimització. En la majoria d'ells és ‘//’"
+    tip_lines_of_code: "Mesurar el progrés d'un codi per les seves línies és com mesurar el progrés d'un avió pel seu pes. — Bill Gates"
+    tip_source_code: "Vull canviar el món, però no em vol donar el seu codi font."
+    tip_javascript_java: "Java és a JavaScript el que un cotxe a una catifa. - Chris Heilmann"
+    tip_move_forward: "Facis el que facis, sempre segueix endavant. - Martin Luther King Jr."
+    tip_google: "Tens un problema que no pots resoldre? Cerca a Google!"
+    tip_adding_evil: "Afegint una mica de maldat."
+    tip_hate_computers: "La raó real per la qual la gent creu que odia els ordinadors és pels programadors pèssims. - Larry Niven"
+    tip_open_source_contribute: "Pots ajudar a millorar CodeCombat!"
+    tip_recurse: "La iteració és humana, la recursivitat és divina. - L. Peter Deutsch"
+    tip_free_your_mind: "T'has de deixar endur, Neo. Por, dubtes, i incredulitat. Allibera la teva ment. - Morpheus"
+    tip_strong_opponents: "Fins i tot el més fort dels oponents té alguna debilitat. - Itachi Uchiha"
+    tip_paper_and_pen: "Abans de començar a programar, sempre has de començar planejant amb paper i boli."
+    tip_solve_then_write: "Primer, resol el problema. Després, escriu el codi. - John Johnson"
 
   game_menu:
     inventory_tab: "Inventari"
     save_load_tab: "Desa/Carrega"
     options_tab: "Opcions"
     guide_tab: "Gui"
-    guide_video_tutorial: "Video Tutorial"
+    guide_video_tutorial: "Vídeo Tutorial"
     guide_tips: "Consells"
     multiplayer_tab: "Multijugador"
     auth_tab: "Dona't d'alta"
     inventory_caption: "Equipa el teu heroi"
     choose_hero_caption: "Tria l'heroi, llenguatge"
-    save_load_caption: "... i veu l'historial"
+    save_load_caption: "... i mira l'historial"
     options_caption: "Edita la configuració"
     guide_caption: "Documents i pistes"
     multiplayer_caption: "Juga amb amics!"
@@ -375,10 +369,10 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     week: "Aquesta Setmana"
     all: "Tots els temps"
     time: "Temps"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
-    difficulty: "Difficultat"
-#    gold_collected: "Gold Collected"
+    damage_taken: "Mal rebut"
+    damage_dealt: "Mal inflingit"
+    difficulty: "Dificultat"
+    gold_collected: "Or recol·lectat"
 
   inventory:
     equipped_item: "Equipat"
@@ -394,74 +388,60 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 
   buy_gems:
     few_gems: "Algunes gemmes"
-#    pile_gems: "Pile of gems"
+    pile_gems: "Pila de gemmes"
     chest_gems: "Cofre de gemmes"
     purchasing: "Comprant..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
+    declined: "La teva targeta ha estat rebutjada"
+    retrying: "Error del servidor, intentant de nou."
+    prompt_title: "Gemmes insuficients"
     prompt_body: "En vols més?"
     prompt_button: "Entrar a la botiga"
-#    recovered: "Previous gems purchase recovered. Please refresh the page."
-#    price: "x3500 / mo"
+    recovered: "S'han recuperat les anteriors compres de gemmes. Si us plaus, recarrega al pàgina."
+    price: "x3500 / més"
 
   subscribe:
-#    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-    feature1: "60+ nivells bàsics a traves de 4 móns" # {change}
-#    feature2: "10 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "80+ bonus levels"
-#    feature4: "<strong>3500 bonus gems</strong> every month!"
-    feature5: "Video tutorials"
-#    feature6: "Premium email support"
-#    feature7: "Private <strong>Clans</strong>"
-    free: "Gratuit"
-#    month: "month"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+    comparison_blurb: "Afina les teves habilitats amb una subscripció a CodeCombat!"
+    feature1: "Més de 60 nivells bàsics a traves de 4 móns" # {change}
+    feature2: "10 <strong>nous herois</strong> poderosos amb habilitats úniques!"
+    feature3: "Més de 80 nivells bonus"
+    feature4: "<strong>3500 gemmes bonus</strong> cada mes!"
+    feature5: "Vídeo tutorials"
+    feature6: "Suport Premium per correu electrònic"
+    feature7: "Privat <strong>Clans</strong>"
+    free: "Gratuït"
+    month: "mes"
+    must_be_logged: "Necessites identificar-te. Si us plau, crea un compte o identifica't al menú de la part superior."
     subscribe_title: "Subscriu-te"
-#    unsubscribe: "Unsubscribe"
-#    confirm_unsubscribe: "Confirm Unsubscribe"
-#    never_mind: "Never Mind, I Still Love You"
-#    thank_you_months_prefix: "Thank you for supporting us these last"
-#    thank_you_months_suffix: "months."
-#    thank_you: "Thank you for supporting CodeCombat."
-#    sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-#    unsubscribe_feedback_placeholder: "O, what have we done?"
-#    parent_button: "Ask your parent"
-#    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-    parent_email_input_invalid: "Adreça electrònica invalida."
-#    parent_email_input_label: "Parent email address"
-#    parent_email_input_placeholder: "Enter parent email"
+    unsubscribe: "Donar-se de baixa"
+    confirm_unsubscribe: "Confirmar la baixa"
+    never_mind: "No et preocupis, encara t'estimo"
+    thank_you_months_prefix: "Gràcies pel suport donat els últims"
+    thank_you_months_suffix: "mesos."
+    thank_you: "Gràcies per donar suport a CodeCombat."
+    sorry_to_see_you_go: "Llàstima que te'n vagis! Deixa'ns saber què podríem haver fet millor."
+    unsubscribe_feedback_placeholder: "Oh, què hem fet?"
+    parent_button: "Pregunta als teus pares"
+    parent_email_description: "Els escriurem perquè et puguin comprar una subscripció a CodeCombat."
+    parent_email_input_invalid: "Adreça electrònica invàlida."
+    parent_email_input_label: "Correu electrònic dels pares"
+    parent_email_input_placeholder: "Introdueix el correu electrònic dels teus pares"
     parent_email_send: "Envia correu electrònic"
     parent_email_sent: "Correu enviat!"
-#    parent_email_title: "What's your parent's email?"
+    parent_email_title: "Quin és el correu dels teus pares?"
     parents: "Per Pares"
-#    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
-#    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
-#    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
-#    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
-#    sale_button: "Sale!"
-#    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
+    parents_title: "Estimats pares: El vostre fill/a està aprenent a programar. L'ajudeu a continuar?"
+    parents_blurb1: "El vostre fill/a ha jugat __nLevels__ nivells i ha après les bases de la programació. Ajudeu-lo a cultivar el seu interès i compreu-li una subscripció per a que segueixi jugant."
+    parents_blurb1a: "La programació és una habilitat que sens cap mena de dubte el vostre fill/a utilitzarà quan sigui adult. El 2020 un 77% dels llocs de feina requeriran habilitats en programació i els enginyers d'aquest àmbit tindran gran demanda arreu del món. Sabies que la carrera en informàtica és la que té feines més ben pagades?"
+    parents_blurb2: "Per ${{price}} USD/mo, el vostre fill/a tindrà nous reptes cada setmana i un correu electrònic de suport de programadors professionals."
+    parents_blurb3: "Sense risc: Tens una garantia el 100% del preu de la subscripció en cas que et donis de baixa."
+    payment_methods: "Mètodes de pagament"
+    payment_methods_title: "Mètodes de pagament acceptats"
+    payment_methods_blurb1: "Acceptem targetes de crèdit i Alipay. També pots pagar amb paypal {{three_month_price}} USD a nick@codecombat.com amb el teu compte per a una subscripció de tres mesos o ${{year_price}} per un any."
+    payment_methods_blurb2: "Si necessites un altre mètode de pagament, avisa'ns."
+    sale_button: "Compra!"
+    sale_button_title: "Estalvia $21 en la compra de la subscripció d'1 any"
     stripe_description: "Subscripció mensual"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -497,19 +463,19 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     programming_language: "Llenguatge de programació"
     programming_language_description: "Quin llenguatge de programació vols utilitzar?"
     default: "Per defecte"
-#    experimental: "Experimental"
-    python_blurb: "Simple però poderós, Python és un bon llenguatge d'us general."
+    experimental: "Experimental"
+    python_blurb: "Simple però poderós, Python és un bon llenguatge d'ús general."
     javascript_blurb: "El llenguatge de les webs."
     coffeescript_blurb: "Sintaxi JavaScript millorat."
     clojure_blurb: "Un Lisp modern."
     lua_blurb: "Llenguatge script per a jocs."
     io_blurb: "Senzill però obscur."
     status: "Estat"
-#    hero_type: "Type"
+    hero_type: "Tipus"
     weapons: "Armes"
-    weapons_warrior: "Espases - Curt abast, No Magic"
-#    weapons_ranger: "Crossbows, Guns - Long Range, No Magic"
-#    weapons_wizard: "Wands, Staffs - Long Range, Magic"
+    weapons_warrior: "Espases - Curt abast, no hi ha màgia"
+    weapons_ranger: "Ballestes, armes - de llarg abast, no hi ha màgia"
+    weapons_wizard: "Varetes, bastons - Llarg abast, Màgia"
     attack: "Dany" # Can also translate as "Attack"
     health: "Salut"
     speed: "Velocitat"
@@ -528,7 +494,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    speed_2: "meters per second."
 #    available_for_purchase: "Available for Purchase" # Shows up when you have unlocked, but not purchased, a hero in the hero store
 #    level_to_unlock: "Level to unlock:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
-    restricted_to_certain_heroes: "Nomès certs herois poden jugar aquest nivell."
+    restricted_to_certain_heroes: "Només certs herois poden jugar aquest nivell."
 
   skill_docs:
 #    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
@@ -573,7 +539,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
 
   about:
-    why_codecombat: "Perquè CodeCombat?"
+    why_codecombat: "Per què CodeCombat?"
 #    why_paragraph_1: "If you want to learn to program, you don't need lessons. You need to write a lot of code and have a great time doing it."
 #    why_paragraph_2_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
 #    why_paragraph_2_italic: "yay a badge"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,32 +644,30 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Enviar comentari"
-    contact_candidate: "Contactar amb el candidat" # Deprecated
-    recruitment_reminder: "Utilitza aquest formulari per a contactar amb els candidats que vols entrevistar. Recorda que CodeCombat cobrará el 15% del sou del primer any. El cost es per la contactacio del treballador i es reemborsable durant 90 dies si el treballdor no roman contractat . Temporals, a distancia i treballadors de contracte són gratuits, com els becaris." # Deprecated
 
   account_settings:
-    title: "Configuració de la compta"
-    not_logged_in: "Inicia sessió o crea una compta per a canviar la configuració."
+    title: "Configuració del compte"
+    not_logged_in: "Inicia sessió o crea un compte per a canviar la configuració."
     autosave: "Els canvis es guarden automàticament"
     me_tab: "Jo"
     picture_tab: "Foto"
-#    delete_account_tab: "Delete Your Account"
-#    wrong_email: "Wrong Email"
-#    wrong_password: "Wrong Password"
+    delete_account_tab: "Elimina el teu compte"
+    wrong_email: "Correu erroni"
+    wrong_password: "Contrasenya invàlida"
     upload_picture: "Carrega una foto"
-#    delete_this_account: "Delete this account permanently"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
-#    god_mode: "God Mode"
+    delete_this_account: "Elimina aquest compte de forma permanent"
+    reset_progress_tab: "Reinicia tot el progrés"
+    reset_your_progress: "Reiniciar tot el progrés i començar de nou"
+    god_mode: "Mode Déu"
     password_tab: "Contrasenya"
     emails_tab: "Missatges"
     admin: "Administrador"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "Clica aquí per administrar la teva subscripció."
     new_password: "Contrasenya nova"
     new_password_verify: "Verifica"
-#    type_in_email: "Type in your email to confirm account deletion."
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
-#    type_in_password: "Also, type in your password."
+    type_in_email: "Escriu el teu correu electrònic per confirmar l'eliminació del compte."
+    type_in_email_progress: "Escriu el teu correu electrònic per confirmar l'eliminació del teu progrés."
+    type_in_password: "Escriu també la teva contrasenya."
     email_subscriptions: "Subscripcions via correu electrònic"
     email_subscriptions_none: "Sense subsrcipcions de correu electrònic."
     email_announcements: "Notícies"
@@ -759,21 +678,16 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     email_any_notes_description: "Desactiva totes les notificacions via correu electrònic."
     email_news: "Noticies"
     email_recruit_notes: "Oportunitats de feina"
-#    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-    contribute_suffix: " per a trobar més."
+    email_recruit_notes_description: "Si jugues realment bé ens posarem en contacte amb tu per oferir-te feina."
+    contributor_emails: "Subscripció als correus electrònics de cada classe"
+    contribute_prefix: "Estem buscant gent que s'uneixi! Mira "
+    contribute_page: "la pàgina de col·laboració"
+    contribute_suffix: " per llegir més informació."
     email_toggle: "Activa-ho tot"
     error_saving: "Error en desar"
     saved: "Canvis desats"
     password_mismatch: "Les contrasenyes no coincideixen."
     password_repeat: "Siusplau, repetiu la contrasenya."
-    job_profile: "Perfil professional" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-    sample_profile: "Mira un perfil de mostra"
-    view_profile: "Mira el teu perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Dreceres del teclat"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1097,24 +1015,24 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    length: "Length:"
 
   classes:
-#    archmage_title: "Archmage"
-#    archmage_title_description: "(Coder)"
-#    archmage_summary: "If you are a developer interested in coding educational games, become an archmage to help us build CodeCombat!"
+    archmage_title: "Arximag"
+    archmage_title_description: "(Programador)"
+    archmage_summary: "Si ets un programador interessat en els jocs educatius sigues un arximag i ajuda'ns a construir CodeCombat!"
     artisan_title: "Artesà"
     artisan_title_description: "(Creador de nivells)"
-#    artisan_summary: "Build and share levels for you and your friends to play. Become an Artisan to learn the art of teaching others to program."
+    artisan_summary: "Construeix i comparteix nivells per als teus amics. Sigues un Artesà per aprendre l'art d'ensenyar als altres a programar."
     adventurer_title: "Aventurer"
     adventurer_title_description: "(Provador de nivells)"
-#    adventurer_summary: "Get our new levels (even our subscriber content) for free one week early and help us work out bugs before our public release."
+    adventurer_summary: "Accedeix als nostres nivells (fins i tot el contingut de pagament) una setmana abans i gratuïtament i ajuda'ns a descobrir errors abans que siguin públics."
     scribe_title: "Escriba"
     scribe_title_description: "(Editor d'articles)"
-#    scribe_summary: "Good code needs good documentation. Write, edit, and improve the docs read by millions of players across the globe."
+    scribe_summary: "Un bon codi necessita una bona documentació. Escriu, edita i millora els documents que són llegits per milions de jugadors arreu del món."
     diplomat_title: "Diplomàtic"
     diplomat_title_description: "(Traductor)"
-#    diplomat_summary: "CodeCombat is localized in 45+ languages by our Diplomats. Help us out and contribute translations."
-#    ambassador_title: "Ambassador"
-#    ambassador_title_description: "(Support)"
-#    ambassador_summary: "Tame our forum users and provide direction for those with questions. Our ambassadors represent CodeCombat to the world."
+    diplomat_summary: "CodeCombat s'està traduint a més de 45 idiomes pels nostres Displomàtics. Ajuda'ns a traduir!"
+    ambassador_title: "Ambaixador"
+    ambassador_title_description: "(Suport)"
+    ambassador_summary: "Posar ordre als fòrums i respondre a les preguntes que sorgeixin. Els nostres Ambaixadors representen a CodeCombat envers el món."
 
   editor:
 #    main_title: "CodeCombat Editors"
@@ -1205,41 +1123,41 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    done_adding: "Done Adding"
 
   article:
-    edit_btn_preview: "Vista previa"
+    edit_btn_preview: "Vista prèvia"
     edit_article_title: "Editar l'article"
 
 #  polls:
 #    priority: "Priority"
 
   contribute:
-#    page_title: "Contributing"
-#    intro_blurb: "CodeCombat is 100% open source! Hundreds of dedicated players have helped us build the game into what it is today. Join us and write the next chapter in CodeCombat's quest to teach the world to code!"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
-#    class_attributes: "Class Attributes"
+    page_title: "Contribueix"
+    intro_blurb: "CodeCombat és 100% codi obert! Una gran quantitat de jugadors ens han ajudat a construir el joc tal com és avui. Uneix-te a l'aventura d'ensenyar a programar!"
+    alert_account_message_intro: "Hola!"
+    alert_account_message: "Per subscriure't a alguna classe, necessites estar identificat."
+    archmage_introduction: "Una de les millors parts de construir jocs és que aglutinen coses molt diverses. Gràfics, sons, treball en temps real, xarxes socials, i per suposat la programació, des del baix nivell d'ús de bases de dades i administració del servidor fins a dissenyar i crear interfícies. Hi ha molt a fer, i si ets un programador amb experiència i amb l'anhel de submergir-te dins CodeCombat aquesta classe és per tu. Ens encantarà tenir la teva ajuda en el millor joc de programació que hi ha."
+    class_attributes: "Atributs de la classe"
     archmage_attribute_1_pref: "Coneixement en "
-#    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
-#    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
+    archmage_attribute_1_suf: ", o ganes d'aprendre'n. La major part del nostre codi és en aquest llenguatge. Si ets un fan de Ruby o Python et sentiràs com a casa. És JavaScript però més agradable."
+    archmage_attribute_2: "Certa experiència programant i iniciativa personal. T'orientarem, però no podem dedicar molt de temps en ensenyar-te."
     how_to_join: "Com unir-se"
-#    join_desc_1: "Anyone can help out! Just check out our "
-#    join_desc_2: "to get started, and check the box below to mark yourself as a brave Archmage and get the latest news by email. Want to chat about what to do or how to get more deeply involved? "
-#    join_desc_3: ", or find us in our "
-#    join_desc_4: "and we'll go from there!"
-#    join_url_email: "Email us"
-#    join_url_hipchat: "public Slack channel"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: ", then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-#    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-#    artisan_join_step1: "Read the documentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
-#    artisan_join_step3: "Find us in our public Slack channel for help."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
+    join_desc_1: "Qualsevol pot ajudar! Visita el nostre "
+    join_desc_2: "per començar i i marca la casella d'abaix per registra-te com a Arximag i estar al dia del correus electrònics que enviem. Vols saber què fer o que t'expliquem més a fons en què consisteix? "
+    join_desc_3: ", o troba'ns al nostre "
+    join_desc_4: "i t'ho explicarem!"
+    join_url_email: "Escriu-nos"
+    join_url_hipchat: "canal públic d'Slack"
+    archmage_subscribe_desc: "Rebre els correus sobre noves oportunitats de programació."
+    artisan_introduction_pref: "Hem de construir nous nivells! La gent reclama més continguts i les nostres forces són limitades. Ara mateix el nostre lloc de treball és de nivell 1; el nostre editor de nivells és tot just útil per als seus creadors, així que ves en compte. Si tens algunes idees sobre campanyes amb bucles for per "
+    artisan_introduction_suf: ", llavors aquesta classe és per a tu."
+    artisan_attribute_1: "Experiència en construcció de continguts d'aquest estil seria genial, com per exemple l'editor de nivells de Blizzard. Però no és un requisit!"
+    artisan_attribute_2: "Ganes de fer moltes proves i iteracions. Per fer bons nivells necessitaràs mostrar-ho a altres i veure com juguen i estar preparat per a reparar tot el que calgui."
+    artisan_attribute_3: "De moment, la resistència va de la mà de l'Aventurer. El nostre editor de nivells es troba en una fase molt preliminar i pot ser un poc frustrant. Estàs avisat!"
+    artisan_join_desc: "Utilitza l'editor de nivells a través d'aquests passos:"
+    artisan_join_step1: "Llegeix la documentació."
+    artisan_join_step2: "Crea un nivell nou i explora els ja creats."
+    artisan_join_step3: "Troba'ns al nostre canal públic d'Slack per a més ajuda."
+    artisan_join_step4: "Anuncia els teus nivells al fòrum per a més opinions."
+    artisan_subscribe_desc: "Rebre els correus electrònics per seguir les novetats."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
 #    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
 #    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
@@ -1254,17 +1172,17 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    contact_us_url: "Contact us"
 #    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
 #    scribe_subscribe_desc: "Get emails about article writing announcements."
-#    diplomat_introduction_pref: "So, if there's one thing we learned from the "
-#    diplomat_launch_url: "launch in October"
-#    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-#    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-#    diplomat_i18n_page_prefix: "You can start translating our levels by going to our"
-#    diplomat_i18n_page: "translations page"
-#    diplomat_i18n_page_suffix: ", or our interface and website on GitHub."
-#    diplomat_join_pref_github: "Find your language locale file "
-#    diplomat_github_url: "on GitHub"
-#    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
+    diplomat_introduction_pref: "Si alguna cosa vam aprendre del que vam "
+    diplomat_launch_url: "llançar a l'octubre"
+    diplomat_introduction_suf: "és que hi ha un gran interès en CodeCombat a altres països! Estem construint un cos de traductors per aconseguir que CodeCombat sigui tan accessible arreu del món com sigui possible. Si t'agrada aconseguir els nivells tan aviat com surten i poder-los oferir als teus compatriotes llavors aquesta classe és per tu."
+    diplomat_attribute_1: "Fluïdesa en l'anglès i en l'idioma al que vulguis traduir. Al transmetre idees complicades és important tenir un gran coneixement dels dos idiomes!"
+    diplomat_i18n_page_prefix: "Pots començar traduint els nostres nivells a la"
+    diplomat_i18n_page: "pàgina de traduccions"
+    diplomat_i18n_page_suffix: ", o bé la interfície web a GitHub."
+    diplomat_join_pref_github: "Troba els nostres fitxers d'idiomes "
+    diplomat_github_url: "a GitHub"
+    diplomat_join_suf_github: ", edita'ls i envia una petició de modificació. A més, marca la casella d'abaix per mantenir-te informat d'esdeveniments de traducció!"
+    diplomat_subscribe_desc: "Rebre correus sobre el desenvolupament de i18n i la traducció de nivells."
 #    ambassador_introduction: "This is a community we're building, and you are the connections. We've got forums, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
 #    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
@@ -1296,7 +1214,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    battle_as: "Battle as "
     summary_your: "Les teves "
     summary_matches: "Partides - "
-    summary_wins: " Victories, "
+    summary_wins: " Victòries, "
     summary_losses: " Derrotes"
 #    rank_no_code: "No New Code to Rank"
 #    rank_my_game: "Rank My Game!"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     payments: "Pagaments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
     service_apple: "Apple"
@@ -1502,39 +1419,39 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    members: "Members"
 #    users: "Users"
 
-#  concepts:
-#    advanced_strings: "Advanced Strings"
-#    algorithms: "Algorithms"
-#    arguments: "Arguments"
-#    arithmetic: "Arithmetic"
-#    arrays: "Arrays"
-#    basic_syntax: "Basic Syntax"
-#    boolean_logic: "Boolean Logic"
-#    break_statements: "Break Statements"
-#    classes: "Classes"
-#    continue_statements: "Continue Statements"
-#    for_loops: "For Loops"
-#    functions: "Functions"
-#    graphics: "Graphics"
-#    if_statements: "If Statements"
-#    input_handling: "Input Handling"
-#    math_operations: "Math Operations"
-#    object_literals: "Object Literals"
-#    parameters: "Parameters"
-#    strings: "Strings"
-#    variables: "Variables"
-#    vectors: "Vectors"
-#    while_loops: "Loops"
-#    recursion: "Recursion"
+  concepts:
+    advanced_strings: "Cadenes de text avançades (string)"
+    algorithms: "Algorismes"
+    arguments: "Arguments"
+    arithmetic: "Aritmètica"
+    arrays: "Cadenes (array)"
+    basic_syntax: "Sintaxis bàsica"
+    boolean_logic: "Lògica booleana"
+    break_statements: "Declaracions Break"
+    classes: "Classes"
+    continue_statements: "Sentències Continue"
+    for_loops: "Bucles (For)"
+    functions: "Funcions"
+    graphics: "Gràfics"
+    if_statements: "Sentències If"
+    input_handling: "Manipulació de dades d'entrada"
+    math_operations: "Operacions matemàtiques"
+    object_literals: "Objectes Literals"
+    parameters: "Paràmetres"
+    strings: "Strings"
+    variables: "Variables"
+    vectors: "Vectors"
+    while_loops: "Bucles (While)"
+    recursion: "Recursivitat"
 
   delta:
     added: "Afegit"
     modified: "Modificat"
-#    not_modified: "Not Modified"
+    not_modified: "No modificat"
     deleted: "Eliminat"
     moved_index: "Índex desplaçat"
-#    text_diff: "Text Diff"
-#    merge_conflict_with: "MERGE CONFLICT WITH"
+    text_diff: "Diferir text"
+    merge_conflict_with: "Conflicte d'unió amb"
     no_changes: "Sense canvis"
 
   multiplayer:
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
     cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premis del torneig" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     license: "llicencia"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "Configuració" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Modifica el perfil"
-    done_editing: "Acaba l'edició"
-    profile_for_prefix: "Perfil de "
-    profile_for_suffix: ""
-    featured: "Destacat"
-    not_featured: "Sense destacar"
-    looking_for: "Buscant:"
-    last_updated: "Ultima actualització:"
-    contact: "Contacta"
-    active: "Buscant entrevistes de feina"
-#    inactive: "Not looking for offers right now"
-    complete: "complet"
-    next: "Seguent"
-    next_city: "ciutat?"
-    next_country: "escull el teu país."
-    next_name: "nom?"
-    next_short_description: "escriu una breu descripció."
-    next_long_description: "descriu el lloc de feina que desitges."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-    basics_active: "Obert a ofertes"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-    basics_city: "Ciutat"
-    basics_city_help: "En quina ciutat t'agradaria treballar (o viure ara)."
-    basics_country: "País"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-    basics_looking_for_full_time: "Temps complet"
-    basics_looking_for_part_time: "Temporal"
-    basics_looking_for_remote: "A distancia"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-    name_header: "Omplir amb el teu nom"
-    name_anonymous: "Desenvolupador anònim"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-    skills_header: "Habilitats"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Experiència laboral"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-    work_description: "Descripció"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Educació"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "Escola"
-    education_school_help: "Nom de la teva escola."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-    education_duration_help: "Quan?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-    projects: "Projectes"
-    projects_header: "Afegeix 3 projectes"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-    project_name: "Nom del projecte"
-#    project_name_help: "What was the project called?"
-    project_description: "Descripció"
-#    project_description_help: "Briefly describe the project."
-    project_picture: "Imatge"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-    project_link: "Enllaç"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Comença"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-    filter_education_other: "Altres"
-    filter_role_web_developer: "Desenvolupador web"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-    filter_experience: "Experiencia"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-    filter_results: "resultats"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-    what: "Que és CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Nom"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-    candidate_who: "Qui"
-#    featured_developers: "Featured Developers"
-    other_developers: "Altres desenvolupadors"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    av_entities_sub_title: "Entities"
     av_entities_users_url: "Usuaris"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Altres"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index 0c832ca22..495232d55 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Pro vývojáře" # Not currently shown on home page.
     or_ipad: "Nebo stáhnout pro iPad"
-    hoc_class_code: "Mám heslo pro třídu"
-    hoc_enter: "Vstoupit"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Úrovně" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     creating: "Vytvářím účet..."
     sign_up: "Přihlášení"
     log_in: "zadejte vaše heslo"
-    social_signup: "Nebo se přihlašte přes Facebook nebo Google+:"
     required: "Nejprve se musíte přihlásit."
     login_switch: "Máte již účet?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     incomplete: "Nedokončený"
     timed_out: "Vypršel čas"
     failing: "Selhání"
-    action_timeline: "Časová osa"
-    click_to_select: "Vyberte kliknutím."
     control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Vstoupit do hry"
     reload: "Znovu načíst"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     parents_title: "Vaše dítě se naučí programovat." # {change}
     parents_blurb1: "Pomocí CodeCombat se vaše dítě učí psaním opravdového kódu. Začínají učením se základním příkazů a postupně se přidávají pokročilejší témata."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "Za $9.99 USD/měsíc, získají nové výzvy každý týden a osobní emailovou podporu od profesionálních programátorů." # {change}
+    parents_blurb2: "Za ${{price}} USD/měsíc, získají nové výzvy každý týden a osobní emailovou podporu od profesionálních programátorů." # {change}
     parents_blurb3: "Bez rizika: 100% záruka vrácení peněz, jednoduché zrušení předplatného na 1 kliknutí."
     payment_methods: "Platební metody"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
     sale_button: "Výprodej!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Měsíční předplatné"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Pro hraní této úrovně potřebujete předplatné."
     unlock_help_videos: "Kupte si předplatné pro odemčení všech tutoriálových videí."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "Systemové požadavky"
-    sys_requirements_1: "Protože CodeCombat je hra, pro počítače je to více náročnější než přehrávání videa. Optimalizovali jsme CodeCombat, aby běžel rychle na všech moderních prohlížečích a dokonce i na starších mašinách, takže každý může hrát. Takže tady jsou naše návrhy, jak si co nejvíce užít váš Hour of Code zážitek:" # {change}
-    sys_requirements_2: "Používejte nejnovější verzi Chromu nebo Firefoxu." # {change}
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     screenshot_included: "Snímek obrazovky zahrnut."
     where_reply: "Kam máme odpovědět?"
     send: "Odeslat připomínku"
-    contact_candidate: "Kontaktovat kandidáta" # Deprecated
-    recruitment_reminder: "Použijte tento formulář pro kontaktování kandidátů, se kterými chcete udělat rozhovor. Pamatujte, že CodeCombat si účtuje 15% z platu po dobu prvního roku. Tento poplatek je splatný při náboru zaměstancnů a je vratný do 90 dní pokud zaměstnanec nezůstane zaměstnán. Zaměstnanci na částečný úvazek, dálkový a zaměstnanci se smlouvami jsou zdarma, stejně jako stážisté." # Deprecated
 
   account_settings:
     title: "Nastavení účtu"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     saved: "Změny uloženy"
     password_mismatch: "Hesla nesouhlasí."
     password_repeat: "Opakujte prosím vaše heslo."
-    job_profile: "Pracovní profil" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Váš pracovní profil byl schválen. Zaměstnavatelé ho uvidí do doby, než ho neoznačíte jako neaktivní nebo nebude změněn po dobu 4 týdnů."
-    job_profile_explanation: "Ahoj! Vyplň tohle a kontaktujeme tě ohledně nalezení práce jako vývojář softwaru."
-    sample_profile: "Podívat se na ukázkový profil"
-    view_profile: "Podívat se na profil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Klávesové zkratky"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     payments: "Platby"
     prepaid_codes: "Předplacené kódy"
     purchased: "Zaplaceno"
-    sale: "Výprodej"
     subscription: "Předplatné"
     invoices: "Faktury"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     email_settings_url: " nastavení emailu"
     email_description_suffix: "nebo skrze odkazy v odeslaných emailech si můžete nastavit nebo se kdykoliv odhlásit z naší korespondence."
     cost_title: "Cena"
-    cost_description: "Momentálně je CodeCombat 100% zdarma! Naší snahou je udržet přístup zdarma, abychom dali možnost hrát co největšímu množství lidí. V případě nutnosti budeme muset přejít na placený vstup nebo platbu za přístup k určitému obsahu, ale raději bychom se tomu vyhnuli. S trochou štěstí doufáme v následující plán monetizace:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights a Licence"
     contributor_title: "Licenční ujednání přispívatelů (CLA)"
     contributor_description_prefix: "Všichni přispívatelé jak na webu tak do projektu na GitHubu spadají pod naše "
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     nutshell_title: "Ve zkratce"
     nutshell_description: "Vše co je poskytnuto v editoru úrovní  je zdarma a mžete toho využít při vytváření úrovní. Ale vyhrazujeme si právo omezit distribuci úrovní samotných (těch, které byly vytvořeny na codecombat.com), takže v budoucnu bude možno tyto zpoplatnit, bude-li to v nejhorším případě nutné"
     canonical: "Anglická verze tohoto dokumentu je původní, rozhodující verzí. Nastane-li rozdíl v překladu, Anglická verze bude mít vždy přednost."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Ceny v turnaji" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     license: "licence"
     oreilly: "ebook vlastního výběru"
 
-  account_profile:
-    settings: "Nastavení" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Upravit Profil"
-    done_editing: "Úpravy dokončeny"
-    profile_for_prefix: "Profil pro "
-    profile_for_suffix: ""
-    featured: "Uvedeno"
-    not_featured: "Neuvedeno"
-    looking_for: "Hledám:"
-    last_updated: "Naposled aktualizováno:"
-    contact: "Kontakt"
-    active: "Právě hledá nabídky na pohovor"
-    inactive: "Právě nehledá nabídky na pohovor"
-    complete: "dokončeno"
-    next: "Další"
-    next_city: "město?"
-    next_country: "vyberte vaši zemi."
-    next_name: "jméno?"
-    next_short_description: "napište krátký popisek."
-    next_long_description: "popište vaši vysněnou pozici."
-    next_skills: "vypište alespoň pět dovedností."
-    next_work: "vypište vaši pracovní historii."
-    next_education: "vypište vaše tituly."
-    next_projects: "ukažte nám tři projekty, na kterých jste pracovali."
-    next_links: "přidejte jakékoliv osobní nebo sociální odkazy."
-    next_photo: "přidejte dodatečnou profesionální fotku."
-    next_active: "označte se jako \"Právě hledá nabídky na pohovor\"."
-    example_blog: "Blog"
-    example_personal_site: "Osobní stránka"
-    links_header: "Osobní odkazy"
-    links_blurb: "Odkažte jakoukoliv jinou stránku nebo profil, kterou chcete vyzdvihnout, jako váš GitHub, váš LinkedIn, nebo váš blog."
-    links_name: "Název odkazu"
-    links_name_help: "Kam odkazujete?"
-    links_link_blurb: "Odkaz"
-    basics_header: "Update basic info"
-    basics_active: "Otevřen nabídkám"
-    basics_active_help: "Chcete nyní nabídku pohovoru?"
-    basics_job_title: "Název vysněné práce"
-    basics_job_title_help: "Jakou práci hledáte?"
-    basics_city: "Město"
-    basics_city_help: "Město, ve kterém chcete pracovat (nebo ve kterém nyní žijete)."
-    basics_country: "Země"
-    basics_country_help: "Země, ve které chcete pracovat (nebo ve které nyní žijete)."
-    basics_visa: "USA pracovní status"
-    basics_visa_help: "Jste autorizován pro práci v USA, nebo potřebujete visa sponzorství? (Pokud žijete v Kanadě nebo Austrálii, zaškrtněte Autorizováno.)"
-    basics_looking_for: "Hledám"
-    basics_looking_for_full_time: "Plný úvazek"
-    basics_looking_for_part_time: "Částečný úvazek"
-    basics_looking_for_remote: "Dálkovou práci"
-    basics_looking_for_contracting: "Smluvní práci"
-    basics_looking_for_internship: "Stáž"
-    basics_looking_for_help: "Jakou chcete pozici vývojáře?"
-    name_header: "Vyplňte své jméno"
-    name_anonymous: "Anonymní vývojář"
-    name_help: "Jméno, pod kterým budete vystupovat, jako \"Jan Novák\"."
-    short_description_header: "Napište krátký popis sama sebe"
-    short_description_blurb: "Přidejte slogat, aby se o vás zaměstnavatel dozvěděl více."
-    short_description: "Slogan"
-    short_description_help: "Kdo jste, a za čím si jdete? 140 znaků max."
-    skills_header: "Dovednosti"
-    skills_help: "Označte relevantní vývojářské dovednosti v pořadí zdatnosti."
-    long_description_header: "Popište vysněnou pozici"
-    long_description_blurb: "Řekněte zaměstavatelům jak jste úžasní a jakou roli chcete."
-    long_description: "Vlastní popis"
-    long_description_help: "Popište sebe, abyste zaujali zaměstnavatele. Zanechte to krátké a výstižné. Doporučujeme navržení pozice, která vás nejvíce zajímá. 600 znaků max."
-    work_experience: "Pracovní zkušenosti"
-    work_header: "Vypište vaši pracovní historii"
-    work_years: "Let zkušeností"
-    work_years_help: "Kolik let profesionálních zkušenost (dostávat zaplaceno) vyvýjením softwaru máte?"
-    work_blurb: "Vypište vaše pracovní zkušenosti, nejnovější jako první."
-    work_employer: "Zaměstnavatel"
-    work_employer_help: "Název vašeho zaměstnavatele."
-    work_role: "Název práce"
-    work_role_help: "Jak se nazývala vaše práce nebo role?"
-    work_duration: "Trvání"
-    work_duration_help: "Jak dlouho jste tam pracoval?"
-    work_description: "Popisek"
-    work_description_help: "Co jste tam dělal? (140 znaků; nepovinné)"
-    education: "Vzdělání"
-    education_header: "Vypište vaše akademické snažení"
-    education_blurb: "Vypište své akademické vzdělání."
-    education_school: "Škola"
-    education_school_help: "Název vaší školy."
-    education_degree: "Titul"
-    education_degree_help: "Jaký je váš titul a obor studia?"
-    education_duration: "Datumy"
-    education_duration_help: "Kdy?"
-    education_description: "Popisek"
-    education_description_help: "Vyzdvihněte cokoliv o této vzdělávací zkušenosti. (140 znaků; nepovinné)"
-    our_notes: "Poznámky CodeCombatu"
-    remarks: "Poznámky"
-    projects: "Projekty"
-    projects_header: "Přidejte 3 projekty"
-    projects_header_2: "Projekty (Nejlepší 3)"
-    projects_blurb: "Vyzdvihněte vaše projekty k ohromení zaměstnavatelů."
-    project_name: "Název projektu"
-    project_name_help: "Jak se projekt jmenoval?"
-    project_description: "Popisek"
-    project_description_help: "Krátce popište projekt."
-    project_picture: "Obrázek"
-    project_picture_help: "Nahrajte 230x115px nebo větší obrázek ukazující projekt."
-    project_link: "Odkaz"
-    project_link_help: "Odkaz na projekt."
-    player_code: "Kód hráče"
-
-  employers:
-    deprecation_warning_title: "Omlouváme se, CodeCombat právě nepřijímá další žadatele."
-    deprecation_warning: "Zaměřujeme se na začátečnickou úroveň, místo toho, abychom nalézali vývojářské experty."
-    hire_developers_not_credentials: "Najímejte vývojáře, ne jen ty s tituly." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Začnětě"
-    already_screened: "Již jsme si technicky prověřili všechny naše kandidáty"
-    filter_further: ", ale můžete si také zapnout filtry:"
-    filter_visa: "Visa"
-    filter_visa_yes: "USA autorizováno"
-    filter_visa_no: "Neautorizováno"
-    filter_education_top: "Nejlepší škola"
-    filter_education_other: "Jiné"
-    filter_role_web_developer: "Webový vývojář"
-    filter_role_software_developer: "Softwarový vývojářr"
-    filter_role_mobile_developer: "Mobilní vývojář"
-    filter_experience: "Zkušený"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Čerstvý absolvent"
-    filter_experience_student: "Vysokoškolák"
-    filter_results: "výsledky"
-    start_hiring: "Začít přijímat."
-    reasons: "Tři důvody, pro byste měli přijímat přes nás:"
-    everyone_looking: "Každý zde hledá svou další příležitost."
-    everyone_looking_blurb: "Zapomeňte na 20% LinkedIn InMail míru odezvy. Každý, který je uveden na této stránce chce najít svou další pozici a odpoví na váš požadavek na představení se."
-    weeding: "Opřete se; odstranili jsme všechny mouchy za vás."
-    weeding_blurb: "Každý hráč, který je uveden byl prověřen o svých technických dovednostech. Kandidáti také uvádí poznámky na svých profilech, aby vám ušetřili čas."
-    pass_screen: "Projdou vašimi technickými prověrkami."
-    pass_screen_blurb: "Prohlédněte si kód každého kandidáta. Takto zjistíte, jestli se vám kandidát bude hodit či nikoliv."
-    make_hiring_easier: "Ulehčete mi přijímání zaměstananců, prosím."
-    what: "Co je CodeCombat?"
-    what_blurb: "CodeCombat je multiplayerová prohlížečová programovací hra. Hráči píší köd, kterým ovládají jejich jednotky v boji proti jiným vývojářům. Naši hráči mají dobré zkušenosti s technikou."
-    cost: "Kolik si účtujeme?"
-    cost_blurb: "Účtujeme si 15% z platu po dobu prvního roku a nabízíme 100% záruku vrácení peněz po dobu 90 dní. Neúčtujeme si za kandidáty, se kterými se již aktivně vede pohovor ve vaší společnosti."
-    candidate_name: "Jméno"
-    candidate_location: "Umístění"
-    candidate_looking_for: "Hledá"
-    candidate_role: "Role"
-    candidate_top_skills: "Nejlepší dovednosti"
-    candidate_years_experience: "Roků zkušeností"
-    candidate_last_updated: "Naposled aktualizováno"
-    candidate_who: "Kdo"
-    featured_developers: "Uvedení vývojáři"
-    other_developers: "Jiní vývojáři"
-    inactive_developers: "Neaktivní vývojáři"
-
   admin:
     av_espionage: "Špionáž" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email nebo jméno"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     av_entities_sub_title: "Entity"
     av_entities_users_url: "Uživatelé"
     av_entities_active_instances_url: "Aktivní instance"
-    av_entities_employer_list_url: "Seznam zaměstnavatelů"
-    av_entities_candidates_list_url: "Seznam kandidátů"
     av_entities_user_code_problems_list_url: "Seznam problémů uživatelských kódů"
     av_other_sub_title: "Ostatní"
     av_other_debug_base_url: "Base (pro debugování base.jade)"
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index 26a8d5024..0808d06f7 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "For Udviklere" # Not currently shown on home page.
     or_ipad: "Eller download til iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Spil" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     creating: "Opretter Konto..."
     sign_up: "Registrer"
     log_in: "Log ind med password"
-    social_signup: "Eller du kan skrive dig op med Facebook eller G+:"
     required: "Du skal logge ind før du kan gå den vej."
     login_switch: "Har du allerede en konto?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     incomplete: "Ufærdig"
     timed_out: "Løb tør for tid"
     failing: "Fejler"
-    action_timeline: "Handlingstidslinje"
-    click_to_select: "Klik på en enhed for at vælge"
     control_bar_multiplayer: "Flerspiller"
     control_bar_join_game: "Tilslut spil"
     reload: "Genindlæs"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Kontoindstillinger"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     saved: "Ændringer Gemt"
     password_mismatch: "Password matcher ikke."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profil for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    av_entities_sub_title: "Entities"
     av_entities_users_url: "Brugere"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Andre"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee
index 4a935cc87..23cd22f54 100644
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     multiplayer: "Mehrspieler" # Not currently shown on home page
     for_developers: "Für Entwickler" # Not currently shown on home page.
     or_ipad: "Oder für iPad runterladen"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Spielen" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     creating: "Erzeuge Account..."
     sign_up: "Neuen Account anlegen"
     log_in: "mit Passwort einloggen"
-    social_signup: "oder, du registriest dich über Facebook oder G+:"
     required: "Du musst dich vorher einloggen um dort hin zu gehen."
     login_switch: "Du hast bereits einen Account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     incomplete: "Unvollständig"
     timed_out: "Zeit abgelaufen"
 #    failing: "Failing"
-    action_timeline: "Aktionszeitlinie"
-    click_to_select: "Klicke auf eine Einheit, um sie auszuwählen."
     control_bar_multiplayer: "Mehrspieler"
     control_bar_join_game: "Spiel beitreten"
     reload: "Neu laden"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-    more_info: "Info für Lehrer"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Sende Feedback"
-    contact_candidate: "Kontaktiere Kandidaten" # Deprecated
-    recruitment_reminder: "Benutzen Sie dieses Formular um Kontakt zu Kandidaten aufzunehmen, an denen Sie interessiert sind. Bedenken Sie das CodeCombat 15% des ersten Jahresgehaltes berechnet. Diese Gebühr wird fällig wenn Sie den Kandidaten einstellen und ist für 90 Tage rückerstattungsfähig, sollte der Mitarbeiter nicht eingestellt bleiben. Mitarbeiter die für Teilzeit, Remote oder eine Auftragsarbeit eingestellt werden sind kostenlos, das gilt auch für Praktikanten." # Deprecated
 
   account_settings:
     title: "Accounteinstellungen"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     saved: "Änderungen gespeichert"
     password_mismatch: "Passwörter stimmen nicht überein."
     password_repeat: "Bitte wiederhole dein Passwort."
-    job_profile: "Jobprofil" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Dein Jobprofil wurde von CodeCombat freigegeben. Arbeitgeber können dieses solange einsehen, bis du es als inaktiv markiert oder wenn innerhalb von vier Wochen keine Änderung daran vorgenommen wurde."
-    job_profile_explanation: "Hi! Fülle dies aus und wir melden uns bei dir bezüglich des Auffindens eines Jobs als Programmierer"
-    sample_profile: "Ein Beispielprofil ansehen"
-    view_profile: "Dein Profil ansehen"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Tastaturkürzel"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     email_settings_url: "deiner Emaileinstellungen"
     email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen."
     cost_title: "Kosten"
-    cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights und Lizenzen"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     nutshell_title: "Zusammenfassung"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
     canonical: "Die englische Version dieses Dokuments ist die definitive, kanonische Version. Sollte es Unterschiede zwischen den Übersetzungen geben, dann hat das englische Dokument Vorrang."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Turnierpreise" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     license: "Lizenz"
     oreilly: "Ebook deiner Wahl"
 
-  account_profile:
-    settings: "Einstellungen" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Profil editieren"
-    done_editing: "Editierung beenden"
-    profile_for_prefix: "Profil von "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "Suche nach:"
-    last_updated: "zuletzt geändert:"
-    contact: "Kontakt"
-    active: "Suche jetzt nach Interview-Angeboten"
-    inactive: "Suche momentan nicht nach Angeboten"
-    complete: "komplett"
-#    next: "Next"
-    next_city: "Stadt?"
-    next_country: "Wähle dein Land."
-    next_name: "Name?"
-    next_short_description: "Schreibe eine kurze Beschreibung."
-    next_long_description: "Beschreibe deine gewünschte Position"
-    next_skills: "Liste mindestens fünf Fähigkeiten."
-    next_work: "Liste deine berufliche Erfahrung chronologisch auf."
-    next_education: "Erzähle von deinen schulischen Martyrien."
-    next_projects: "Zeige bis zu 3 Projekte an denen du gearbeitet hast."
-    next_links: "Füge beliebige persönliche oder soziale Links hinzu."
-    next_photo: "Füge ein optionales professionelles Foto hinzu."
-    next_active: "Markiere dich empfänglich für Job-Angebote um in Suchergebnissen zu erscheinen."
-    example_blog: "Blog"
-    example_personal_site: "Persönliche Seite"
-    links_header: "Persönliche Links"
-    links_blurb: "Verlinke zu anderen Seiten oder Profilen die du hervorheben möchtest, wie z.B. dein GitHub, dein LinkedIn oder deinen Blog."
-    links_name: "Link-Name"
-    links_name_help: "Wozu verlinkst du?"
-    links_link_blurb: "Link URL"
-    basics_header: "Aktualisiere Grundangaben"
-    basics_active: "Offen für Angebote"
-    basics_active_help: "Möchtest du nun Angebote für Vorstellungsgespräche erhalten?"
-    basics_job_title: "Gewünschter Job-Titel"
-    basics_job_title_help: "Was für eine Stelle suchst du?"
-    basics_city: "Stadt"
-    basics_city_help: "Stadt in der du arbeiten möchtest (oder jetzt lebst)."
-    basics_country: "Land"
-    basics_country_help: "Land in dem du arbeiten möchtest (oder jetzt lebst)."
-    basics_visa: "US Arbeitserlaubnis"
-    basics_visa_help: "Bist du berechtigt in den USA zu arbeiten oder benötigst du Visa Sponsoring? (Wenn du in Kanada oder Australien lebst, markiere berechtigt.)"
-    basics_looking_for: "Suche nach"
-    basics_looking_for_full_time: "Vollzeit"
-    basics_looking_for_part_time: "Teilzeit"
-    basics_looking_for_remote: "Remote"
-    basics_looking_for_contracting: "Vertragsarbeit"
-    basics_looking_for_internship: "Praktikum"
-    basics_looking_for_help: "Was für eine Art Entwickler-Position suchst du?"
-    name_header: "Trage deinen Namen ein"
-    name_anonymous: "Anonymer Entwickler"
-    name_help: "Name den Arbeitgeber sehen sollen, z.B. 'Nick Winter'."
-    short_description_header: "Schreibe einen kurzen Text über dich"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-    short_description_help: "Wer bist du und wonach suchst du? 140 Zeichen max."
-    skills_header: "Fähigkeiten"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-    long_description_header: "Beschreibe deine gewünschte Position"
-    long_description_blurb: "Teile Arbeitgebern mit wie toll du bist und nach welcher Position du suchst."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Berufserfahrung"
-    work_header: "Liste deine Berufserfahrung chronologisch auf"
-    work_years: "Jahre der Erfahrung"
-    work_years_help: "Wieviele Jahre professionelle Erfahrung (bezahlte Arbeit) hast du mit der Entwicklung von Software?"
-    work_blurb: "Liste deine relevante Berufserfahrung auf, letzte Tätigkeit zuerst."
-    work_employer: "Arbeitgeber"
-    work_employer_help: "Name deines Arbeitgebers."
-    work_role: "Jobtitel"
-    work_role_help: "Was war dein Jobtitel oder deine Rolle?"
-    work_duration: "Dauer"
-    work_duration_help: "Wann warst du dort?"
-    work_description: "Beschreibung"
-    work_description_help: "Was hast du dort gemacht (140 Zeichen; optional)"
-    education: "Schulbildung"
-    education_header: "Erzähle von deinen akademischen Martyrien"
-    education_blurb: "Liste deine akademischen Martyrien."
-    education_school: "Schule"
-    education_school_help: "Name deiner Schule."
-    education_degree: "Abschluss"
-    education_degree_help: "Was war dein Abschluss und deine Fachrichtung?"
-    education_duration: "Daten"
-    education_duration_help: "Wann?"
-    education_description: "Beschreibung"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-    our_notes: "CodeCombat's Notizen"
-    remarks: "Kommentare"
-    projects: "Projekte"
-    projects_header: "Füge 3 Projekte hinzu"
-    projects_header_2: "Projekte (Top 3)"
-    projects_blurb: "Hebe deine Projekte hervor um Arbeitgeber zu verblüffen."
-    project_name: "Projekt Name"
-    project_name_help: "Wie wurde das Projekt genannt?"
-    project_description: "Beschreibung"
-    project_description_help: "Beschreibe kurz das Projekt."
-    project_picture: "Bild"
-    project_picture_help: "Lade ein 230x115px oder größeres Bild hoch, welches das Projekt darstellt."
-    project_link: "Link"
-    project_link_help: "Verlinke zu dem Projekt."
-    player_code: "Spieler Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Stellen Sie Entwickler ein, nicht Qualifikationen." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Legen Sie los"
-    already_screened: "Wir haben alle Kandidaten bereits technisch geprüft"
-    filter_further: ", aber Sie können noch weiter filtern:"
-    filter_visa: "Visum"
-    filter_visa_yes: "US authorisiert"
-    filter_visa_no: "nicht authorisiert"
-    filter_education_top: "Top-Schule"
-    filter_education_other: "Andere"
-    filter_role_web_developer: "Web Entwickler"
-    filter_role_software_developer: "Software Entwickler"
-    filter_role_mobile_developer: "Mobile Entwickler"
-    filter_experience: "Erfahrung"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Vor kurzem promoviert"
-    filter_experience_student: "Student"
-    filter_results: "Ergebnisse"
-    start_hiring: "Beginnen Sie einzustellen."
-    reasons: "Drei Gründe warum Sie durch uns einstellen sollten:"
-    everyone_looking: "Jeder sucht hier nach der nächsten Herausforderung."
-    everyone_looking_blurb: "Vergessen Sie die 20% LinkedIn InMail Antwort-Raten. Jeden den wir auf unseren Webseite listen, sucht nach seiner nächsten Position und wird Ihnen auf Ihren Wunsch zu einem weiteren kennenlernen antworten."
-    weeding: "Lehnen Sie sich zurück; wir haben das Aussortieren für Sie übernommen."
-    weeding_blurb: "Jeden Spieler den wir listen wurde bereits auf seine technischen Fähigkeiten geprüft. Wir führen auch Telefoninterviews mit ausgewählten Kandidaten durch und machen Notizen in ihrem Profil um Ihnen Zeit zu ersparen."
-    pass_screen: "Sie werden Ihre technischen Tests bestehen."
-    pass_screen_blurb: "Prüfen Sie den Code jedes Kandidaten bevor Sie ihn kontaktieren. Ein Arbeitgeber fand heraus das bis zu 5 mal soviele unserer Entwickler sein technisches Screening bestanden als wenn er durch Hacker News eingestellt hätte."
-    make_hiring_easier: "Machen Sie bitte meinen Einstellungsprozess einfachen."
-    what: "Was ist CodeCombat?"
-    what_blurb: "CodeCombat ist ein Mehrspieler Browser-Programmierspiel. Spieler schreiben Code um Ihre Armeen im Kampf gegen andere Entwickler zu steuern. Unsere Spieler habe Erfahrung mit allen wichtigen Tech-Stacks."
-    cost: "Wieviel berechnen wir?"
-    cost_blurb: "Wir berechnen 15% des ersten Jahresgehalts und bieten eine 100% Geld-Zurück-Garantie für 90 Tage an. Wir berechnen nicht für Kandidaten die bereits aktiv an Ihrem Bewerbungsverfahren teilnehmen."
-    candidate_name: "Name"
-    candidate_location: "Standort"
-    candidate_looking_for: "Sucht nach"
-    candidate_role: "Rolle"
-    candidate_top_skills: "Top Fähigkeiten"
-#    candidate_years_experience: "Yrs Exp"
-    candidate_last_updated: "Zuletzt aktualisiert"
-    candidate_who: "Wer"
-#    featured_developers: "Featured Developers"
-    other_developers: "Andere Entwickler"
-    inactive_developers: "Inaktive Etwickler"
-
   admin:
     av_espionage: "Spionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email oder Benutzername"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     av_entities_sub_title: "Entitäten"
     av_entities_users_url: "Benutzer"
     av_entities_active_instances_url: "Aktive Instanzen"
-    av_entities_employer_list_url: "Arbeitgeberliste"
-    av_entities_candidates_list_url: "Kandidatenliste"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Sonstige"
     av_other_debug_base_url: "Base (um base.jade zu debuggen)"
diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee
index d96c8ffad..d6335082f 100644
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Für Entwickler" # Not currently shown on home page.
     or_ipad: "Oder lads fürs iPad abä"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     creating: "Account wird erstellt..."
     sign_up: "Registriere"
     log_in: "Mit Passwort ilogge"
-    social_signup: "Du chasch dich au mit Facebook oder G+ registriere:"
     required: "Du muesch dich zersch ilogge befor du det dure chasch"
     login_switch: "Häsch scho es Account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     incomplete: "Unvollständig"
     timed_out: "Ziit abglaufe"
     failing: "Fehler"
-    action_timeline: "Aktionsziitleiste"
-    click_to_select: "Klick uf e Einheit zum sie uswähle."
     control_bar_multiplayer: "Mehrspiiler"
     control_bar_join_game: "Mitspiilä"
     reload: "Neu lade"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     parents_title: "Liebi Eltere, Ihres Chind isch am Lerne wieme programmiert. Wen Sie im helfe?"
     parents_blurb1: "Ihres CHind hed  __nLevels__ levels gschpilt und hed programmier Basics glernd. Helfed Sie soch dInträssi für sProgrammiere ufrecht zhalte und unterschtützed Sie in idem Sie es Abo chaufed."
     parents_blurb1a: "Programmiere isch en wichtigi Begabig wo Ihres Chind als Erwachsene sicher wird bruche. Ab 2020 werded 77% vo allne Jobs eifachi Programmierkentniss benötige und die wos behersched werded uf de ganze Welt gsuecht. Hend Sie gwüsst das Programmiere de best bezallti Uni abschluss isch?"
-    parents_blurb2: "Für $9.99 USD/im Monät, würd Ihres Chind jedes Wuche neue und spannendi Challenges becho und professionelle E-Mail Support!"
+    parents_blurb2: "Für ${{price}} USD/im Monät, würd Ihres Chind jedes Wuche neue und spannendi Challenges becho und professionelle E-Mail Support!"
     parents_blurb3: "Kei Risikos, 100% Geld zrugg Garantie und ganz eifaches deaboniere mid eim Klick"
     payment_methods: "Zalligs Methode"
     payment_methods_title: "Akzeptierti Zalligs Methode"
     payment_methods_blurb1: "Mier akzeptiered immoment Kreditchartene und  Alipay." # {change}
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Du bruchsch es Abo um das Level zspile."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
     managed_subs: "Abos verwalte"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-    group_discounts_1st: "Erstes Abonement"
-    group_discounts_full: "de ganz Priis"
-    group_discounts_2nd: "Aboniere 2-11"
-    group_discounts_20: "20% billiger"
-    group_discounts_12th: "Aboniere 12+"
-    group_discounts_40: "40% billiger"
     subscribing: "Am Aboniere..."
-    recipient_emails_placeholder: "Gib dini Mails zum Aboniere i, eine pro Linie:"
-    subscribe_users: "Abonier Users"
-    users_subscribed: "Users aboniert:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
     unsubscribing: "Am Abo chünde" # {change}
     subscribe_prepaid: "Klick Aboniere um en PrePaid Code izlöse"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-    more_info: "Info für Lehrer"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-    free_title: "Wie fill choschtets?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-    how_much_title: "Wievil choschtet es monatlichs Abo?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Feedback schicke"
-    contact_candidate: "Kandidat kontaktiere" # Deprecated
-    recruitment_reminder: "Benutz das Formular zum mit Kandidate Kontakt ufneh, i die du interessiert bisch. Bhalt in Erinnerig, dass CodeCombat 15% vom erstjöhrige Lohn verrechnet. De Betrag wird fällig, sobald de Programmierer agstellt wird und chan 90 Täg lang zruggverrechnet werde wenn de Agstellti nid agstellt bliibt. Teilziitarbeit, Fernarbeit und temporäri Agstellti sind chostelos, s gliiche gilt für Interni Mitarbeiter." # Deprecated
 
   account_settings:
     title: "Account Istellige"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-    view_profile: "Dis Profil aluege"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Shortcuts uf de Tastatur"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     email_settings_url: "E-Mail Istellige"
     email_description_suffix: "oder dur d Links i de E-Mails wo mir schicked, chasch du jederziit dini Preferänze ändere und dich ganz eifach us de Mailing-Liste neh."
     cost_title: "Chöste"
-    cost_description: "Im Moment isch CodeCombat 100% gratis! Eis vo üsne Hauptziel isch, dass das so bliibt, damit so viel Lüüt wie möglich chönd spiele, egal wo sie sich im Lebe befinded. Sötted dunkli Wolke am Horizont ufzieh chas sii, dass mir müed en Teil vom Inhalt chostepflichtig mache, aber es isch üs lieber, wenn da nid passiert. Mit chli Glück werded mir fähig sii, s Unternehme ufrecht z erhalte und zwor mit:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "Istellige" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Profil bearbeite"
-    done_editing: "Fertig mit bearbeite"
-    profile_for_prefix: "Profil für "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-    last_updated: "S letzte Update:"
-    contact: "Kontakt"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-    complete: "komplett"
-    next: "Nögst"
-    next_city: "Stadt?"
-    next_country: "wähl dis Land."
-    next_name: "Name?"
-    next_short_description: "schriibe e churzi Beschriibig."
-    next_long_description: "beschriib dini Wunschstell."
-    next_skills: "liste mindestens füf Fähigkeite uf."
-    next_work: "liste din bruefliche Werdegang uf."
-#    next_education: "recount your educational ordeals."
-    next_projects: "Zeig üs bis zu drü Projekt a dene du scho gschaffet hesch."
-    next_links: "füeg persönlichi oder Social Media Links ih."
-    next_photo: "füeg optional es professionells Foti hinzue."
-    next_active: "markier dich selber als offe für Agebot zum i Suechafroge uftauche."
-    example_blog: "Blog"
-    example_personal_site: "Eigeni Websiite"
-    links_header: "Eigeni Links"
-    links_blurb: "Verlinke anderi Sitene oder Profil wo du willsch hervorhebe, wie zum Bispiel dis GitHub, dis LinkedIn Profil oder din Blog."
-    links_name: "Link Name"
-    links_name_help: "Woane verlinksch?"
-    links_link_blurb: "Link URL"
-    basics_header: "Eifachi infos update"
-    basics_active: "Offe für Agebot"
-    basics_active_help: "Wötsch ez gad Interview Agebot?"
-    basics_job_title: "Erwünschte Job Titel"
-    basics_job_title_help: "Noch welem Job suechsch?"
-    basics_city: "Stadt"
-    basics_city_help: "D Stadt wo du willsch schaffe (oder im Moment wohnsch)."
-    basics_country: "Land"
-    basics_country_help: "Country you want to work in (or live in now)."
-    basics_visa: "US Work Status"
-    basics_visa_help: "Hesch du d Berechtigung zum i de USA schaffe oder bruchsch du e Visa Sponsorship? (Wenn du in Kanada oder Australie wohnsch, markier als berechtigt.)"
-    basics_looking_for: "Ich sueche nach"
-    basics_looking_for_full_time: "Vollziit"
-    basics_looking_for_part_time: "Teilziit"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-    basics_looking_for_internship: "Praktikum"
-    basics_looking_for_help: "Weli Art vo Entwicklerposition möchtisch du?"
-    name_header: "Füll din Name us"
-    name_anonymous: "Anonyme Entwickler"
-    name_help: "De Name wo d Entwickler söled gseh, z.B. 'Nick Winter'."
-    short_description_header: "Schriib e churzi Beschriibi vo dir."
-    short_description_blurb: "Füeg e Tagline hinzue, damit Arbeitgeber chönd schnell öppis über dich erfahre."
-    short_description: "Tagline"
-    short_description_help: "Wer bisch du und noch wa suechsch? 140 Charakter max."
-    skills_header: "Fähigkeite"
-    skills_help: "Tagge relevanti Entwicklerfähigkeite gordnet nach Kenntnis."
-    long_description_header: "Beschriib dini Wunschposition"
-    long_description_blurb: "Verzell de Arbetgeber wie fantastisch du bisch und weli Position du gern hettsch."
-    long_description: "Selbstbeschriibig"
-    long_description_help: "Beschriib dich de potentielle Arbetgeber. Halte es churz und relevant. Mir empfehled, churz d Position z umrahme, wo dich am meiste interessiert. Stilvolli Herabsetzig okay; 600 Charakter max."
-    work_experience: "Arbeitserfahrig"
-    work_header: "Liste dini Arbeitserfahrig uf"
-    work_years: "Johr a Arbeitserfahrig"
-    work_years_help: "Wieviel (bezahlti) Johre Erfahrig hesch du im Bereich Softwareentwicklig?"
-    work_blurb: "Liste dini relevant Arbeitserfahrig uf, s neuste als Ersts."
-    work_employer: "Arbeitgeber"
-    work_employer_help: "Name vo dim Arbeitgeber."
-    work_role: "Job Titel"
-    work_role_help: "Was hesch für en Job Titel / Position gha?"
-    work_duration: "Ziitduur"
-    work_duration_help: "Wenn hesch die Astellig gha?"
-    work_description: "Beschriibig"
-    work_description_help: "Wa hesch du det gmacht? (140 Charakter; optional)"
-    education: "Usbildig"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "Schuel"
-    education_school_help: "De Name vo dinere Schuel."
-    education_degree: "Abschluss"
-    education_degree_help: "Was isch din Abschluss und dis Studiefach gsi?"
-    education_duration: "Date"
-    education_duration_help: "Wenn?"
-    education_description: "Beschriibig"
-    education_description_help: "Öppis wo du willsch hervorhebe bezüglich dere Usbildig. (140 Charakter; optional)"
-#    our_notes: "CodeCombat's Notes"
-    remarks: "Bemerkige"
-    projects: "Projekt"
-    projects_header: "Füeg 3 Projekt hinzue"
-    projects_header_2: "Projekt (Top 3)"
-    projects_blurb: "Hebe dini Projekt hervor zum Arbeitgeber in Stuune z versetze."
-    project_name: "Projektname"
-    project_name_help: "Wie het s Projekt gheisse?"
-    project_description: "Beschriibig"
-    project_description_help: "Beschriib churz dis Projekt."
-    project_picture: "Bild"
-    project_picture_help: "Lad es Bild ufe wo 230x115px oder grösser isch zum dis Projekt präsentiere."
-    project_link: "Link"
-    project_link_help: "Link zum Projekt."
-#    player_code: "Player Code"
-
-  employers:
-    deprecation_warning_title: "Sorry, CodeCombat rekrutiert grad nid."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Stell Entwickler ah, nid Zügnis." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee
index 0b8574aca..1c0127355 100644
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     multiplayer: "Mehrspieler" # Not currently shown on home page
     for_developers: "Für Entwickler" # Not currently shown on home page.
     or_ipad: "Oder downloade es hier für das iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Spielen" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     creating: "Erzeuge Account..."
     sign_up: "Neuen Account anlegen"
     log_in: "mit Passwort einloggen"
-    social_signup: "oder, du registrierst dich über Facebook oder G+."
     required: "Du musst dich vorher einloggen diesen Dienst zu nutzen"
     login_switch: "Hast du schon einen Account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     incomplete: "Unvollständig"
     timed_out: "Zeit abgelaufen"
     failing: "Fehlgeschlagen"
-    action_timeline: "Aktionszeitstrahl"
-    click_to_select: "Klicke auf eine Einheit, um sie auszuwählen."
     control_bar_multiplayer: "Mehrspieler"
     control_bar_join_game: "Spiel beitreten"
     reload: "Neu laden"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     parents_title: "Liebe Eltern: Ihr kind erlernt das Programmieren. Wollen Sie es nicht dabei unterstützen?"
     parents_blurb1: "Ihr Kind hat __nLevels__ Level gemeistert und dabei Grundkenntnisse des Programmierens erlangt. Fördern Sie ihr Kind weiterhin, indem sie mit einem Abonnement weitere Herausforderungen freischalten."
     parents_blurb1a: "Das Programmieren entwickelt sich zunehmend zu einem Grundwerkzeug, dass in immer mehr Berufen benötigt wird und ohne Zweifel sich im Leben als eine sehr nützliche Fähigkeit erweisen wird."
-    parents_blurb2: "Für 9.99 im Monat, bekommt Ihr Kind jede Woche neue Herausforderungen sowie persönlichen Email Support von erfahrenen Programmierern."
+    parents_blurb2: "Für {{price}} im Monat, bekommt Ihr Kind jede Woche neue Herausforderungen sowie persönlichen Email Support von erfahrenen Programmierern."
     parents_blurb3: "Kein Risiko: 100% Geld zurück Garantie, und 1-Klick Abokündigung."
     payment_methods: "Zahlungsarten"
     payment_methods_title: "Akzeptierte Zahlungsarten"
     payment_methods_blurb1: "Momentan akzeptieren wir nur Kreditkarten und Alipay." # {change}
     payment_methods_blurb2: "Wenn Sie auf eine andere Art zahlen wollen, bitte kontaktieren Sie"
-    sale_already_subscribed: "Sie haben bereits ein Abonnement!"
-    sale_blurb1: "Spare $21" # {change}
-    sale_blurb2: "vom regelmäßigen Abonnementpreis von $120 für ein ganzes Jahr!"
     sale_button: "Angebot!"
-    sale_button_title: "Spare $21 beim Kauf eines Jahresabonnements" # {change}
-    sale_click_here: "Hier klicken"
-#    sale_ends: "Ends"
-    sale_extended: "*Bestehende Abonnements werden um 1 Jahr verlängert."
-    sale_feature_here: "Dies ist im Abonnement enthalten:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-    sale_continue: "Bereit das Abenteuer fortzusetzen?"
-    sale_limited_time: "Nur für beschränkte Zeit!"
-    sale_new_heroes: "Neue Helden!"
-    sale_title: "Angebot zum neuen Schuljahr"
-    sale_view_button: "Kaufe ein Jahresabonnement für"
+    sale_button_title: "Spare ${{discount}} beim Kauf eines Jahresabonnements" # {change}
     stripe_description: "Monatsabo"
-    stripe_description_year_sale: "Jahresabonnement ($21 Angebot)" # {change}
+    stripe_description_year_sale: "Jahresabonnement (${{discount}} Angebot)" # {change}
     subscription_required_to_play: "Leider musst du ein Abo haben, um dieses Level spielen zu können."
     unlock_help_videos: "Abonniere, um alle Videoanleitungen freizuschalten."
     personal_sub: "Persönliches Abonnement" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     currently_free_until: "Du hast aktuell ein kostenloses Abonnement bis zum"
     was_free_until: "Du hattest ein kostenloses Abonnement bis zum"
     managed_subs: "Verwaltete Abonnements"
-    managed_subs_desc: "Abonnements für andere Spieler (Studenten, Kinder, usw.) hinzufügen"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-    group_discounts: "Gruppenrabatt"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-    group_discounts_1st: "Erstes Abonnement (inklusive deinem)" # {change}
-    group_discounts_full: "voller Preis"
-    group_discounts_2nd: "Abonnements 2-11"
-    group_discounts_20: "20% Rabatt"
-    group_discounts_12th: "Abonnement 12+"
-    group_discounts_40: "40% Rabatt"
     subscribing: "Abonniere..."
-    recipient_emails_placeholder: "Gib die E-Mail-Adressen ein, für die du ein Abonnement übernehmen möchtest, eine pro Zeile."
-    subscribe_users: "Abonnement für Spieler übernehmen"
-    users_subscribed: "Abonnement für Spieler übernommen:"
-    no_users_subscribed: "Abonnement für keine Spieler übernommen, bitte prüfe deine E-Mail-Adressen."
     current_recipients: "Aktuelle Empfänger"
     unsubscribing: "Abonnement wird gekündigt..."
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Info für Lehrer"
-    intro_1: "CodeCombat ist ein Onlinespiel, dass Programmieren lehrt, indem es Schüler Code in gängigen Programmiersprachen schreiben lässt."
-    intro_2: "Keine Vorkenntnisse nötig!"
-    free_title: "Wie viel kostet es?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "Es gibt 110+ kostenlose Level, die alle Konzepte abedecken."
-    free_2: "Ein monatliches Abonnement verschafft Zugang zu Video-Tutorien and zusätzlichen Übungsleveln."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Für Lehrer ist das Abonnement kostenlos!" # {change}
-    teacher_subs_0: "Wir bieten Lehrern ein kostenloses Abonnement zu evaluirungszwecken." # {change}
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "Was beinhaltet ein Abonnement?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-    sub_includes_2: "80+ Übungslevel"
-    sub_includes_3: "Video-Tutorien"
-    sub_includes_4: "Email-Support"
-    sub_includes_5: "10 neue Helden zum Meistern"
-    sub_includes_6: "3500 Juwelen jeden Monat"
-    sub_includes_7: "Private Clans"
-    monitor_progress_title: "Wie verfolge ich die Fortschritte der Schüler?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
     who_for_title: "An wen richtet sich CodeCombat?"
-    who_for_1: "Wir empfehlen CodeCombat Schülern im Alter von 9 Jahren und älter. Es werden keine Vorkenntnisse vorausgesetzt."
-    who_for_2: "Wir haben CodeCombat so gestalltet, dass es sowohl Jungen als auch Mädchen ansprechend finden."
-    material_title: "Wie viel Lernstoff gibt es?"
-    material_premium_server: "Bislang gibt es ungefähr 50 Spielstunden verteilt über 190+ Level (mit Abonnement)."
-    material_1: "Ungefähr 25 Spielstunden kostenlosen Inhalts und zusätzliche 15 Spielstunden die mit einem Abonnement freigeschaltet werden."
-    concepts_title: "Welche Konzepte werde abgedeckt?"
-    how_much_title: "Wie viel kostet ein monatliches Abonnement?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+    who_for_1: "Wir empfehlen CodeCombat Schülern im Alter von 9 Jahren und älter. Es werden keine Vorkenntnisse vorausgesetzt." # {change}
+    who_for_2: "Wir haben CodeCombat so gestalltet, dass es sowohl Jungen als auch Mädchen ansprechend finden." # {change}
     more_info_title: "Wo kann ich mehr Information finden?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "System Voraussetzungen"
-    sys_requirements_1: "Ein aktueller Webbrowser. Neuere Versionen von Chrome, Firefox, oder Safari. Internet Explorer 9 oder aktueller."
-    sys_requirements_2: "CodeCombat wird auf dem iPad noch nicht unterstützt." # {change}
 
   teachers_survey:
     title: "Lehrerumfrage"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     screenshot_included: "Bildschirmfoto hinzugefügt."
     where_reply: "Wohin sollen wir antworten?"
     send: "Sende Feedback"
-    contact_candidate: "Kontaktiere Kandidaten" # Deprecated
-    recruitment_reminder: "Benutzen Sie dieses Formular, um Kontakt zu Kandidaten aufzunehmen, an denen Sie interessiert sind. Bedenken Sie, dass CodeCombat 15% des ersten Jahresgehaltes berechnet. Diese Gebühr wird fällig, wenn Sie den Kandidaten einstellen und ist für 90 Tage rückerstattungsfähig, sollte der Mitarbeiter nicht eingestellt bleiben. Mitarbeiter, die für Teilzeit, Remote oder eine Auftragsarbeit eingestellt werden, sind kostenlos; das gilt auch für Praktikanten." # Deprecated
 
   account_settings:
     title: "Accounteinstellungen"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     saved: "Änderungen gespeichert"
     password_mismatch: "Passwörter stimmen nicht überein."
     password_repeat: "Bitte wiederhole dein Passwort."
-    job_profile: "Jobprofil" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Dein Jobprofil wurde von CodeCombat freigegeben. Arbeitgeber können dieses solange einsehen, bis du es als inaktiv markiert oder wenn innerhalb von vier Wochen keine Änderung daran vorgenommen wurde."
-    job_profile_explanation: "Hi! Fülle dies aus und wir melden uns bei dir bezüglich des Auffindens eines Jobs als Programmierer"
-    sample_profile: "Ein Beispielprofil ansehen"
-    view_profile: "Dein Profil ansehen"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Tastaturkürzel"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     payments: "Zahlungen"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Gekauft"
-#    sale: "Sale"
     subscription: "Abo"
     invoices: "Rechnungen"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     email_settings_url: "deiner Emaileinstellungen"
     email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen."
     cost_title: "Kosten"
-    cost_description: "Alle normalen Level von CodeCombat sind kostenlos spielbar, mit einem Abonnement von $9.99 USD/Monat kann man extra Level Verzweigungen und 3500 Bonus Juwelen pro Monat. Du kannst das Abonnement mit nur einem Klick widerrufen und wir versprechen eine 100% Geld-zurück Garantie."
+    cost_description: "Alle normalen Level von CodeCombat sind kostenlos spielbar, mit einem Abonnement von ${{price}} USD/Monat kann man extra Level Verzweigungen und {{gems}} Bonus Juwelen pro Monat. Du kannst das Abonnement mit nur einem Klick widerrufen und wir versprechen eine 100% Geld-zurück Garantie."
     copyrights_title: "Copyrights und Lizenzen"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     nutshell_title: "Zusammenfassung"
     nutshell_description: "Jegliche Ressourcen, die wir im Level Editor zur Verfügung stellen, sind für dich frei nutzbar, um Levels zu erstellen. Doch wir behalten uns das Recht vor, die Verbreitung der Levels (welche auf codecombat.com erstellt werden) einzuschränken, so dass in der Zukunft dafür gezahlt werden muss, wenn es das ist, was letztendlich passieren wird."
     canonical: "Die englische Version dieses Dokuments ist die definitive, kanonische Version. Sollte es Unterschiede zwischen den Übersetzungen geben, dann hat das englische Dokument Vorrang."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Turnierpreise" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     license: "Lizenz"
     oreilly: "Ebook deiner Wahl"
 
-  account_profile:
-    settings: "Einstellungen" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Profil editieren"
-    done_editing: "Bearbeitung beenden"
-    profile_for_prefix: "Profil von "
-    profile_for_suffix: ""
-    featured: "Featured"
-    not_featured: "Not Featured"
-    looking_for: "Suche nach:"
-    last_updated: "zuletzt geändert:"
-    contact: "Kontakt"
-    active: "Suche jetzt nach Interview-Angeboten"
-    inactive: "Suche momentan nicht nach Angeboten"
-    complete: "komplett"
-    next: "Nächstes"
-    next_city: "Stadt?"
-    next_country: "Wähle dein Land."
-    next_name: "Name?"
-    next_short_description: "Schreibe eine kurze Beschreibung."
-    next_long_description: "Beschreibe deine gewünschte Position"
-    next_skills: "Liste mindestens fünf Fähigkeiten."
-    next_work: "Liste deine berufliche Erfahrung chronologisch auf."
-    next_education: "Erzähle von deinen schulischen Martyrien."
-    next_projects: "Zeige bis zu 3 Projekte an denen du gearbeitet hast."
-    next_links: "Füge beliebige persönliche oder soziale Links hinzu."
-    next_photo: "Füge ein optionales professionelles Foto hinzu."
-    next_active: "Markiere dich empfänglich für Job-Angebote um in Suchergebnissen zu erscheinen."
-    example_blog: "Blog"
-    example_personal_site: "Persönliche Seite"
-    links_header: "Persönliche Links"
-    links_blurb: "Verlinke zu anderen Seiten oder Profilen die du hervorheben möchtest, wie z.B. dein GitHub, dein LinkedIn oder deinen Blog."
-    links_name: "Link-Name"
-    links_name_help: "Wozu verlinkst du?"
-    links_link_blurb: "Link URL"
-    basics_header: "Aktualisiere Grundangaben"
-    basics_active: "Offen für Angebote"
-    basics_active_help: "Möchtest du nun Angebote für Vorstellungsgespräche erhalten?"
-    basics_job_title: "Gewünschter Job-Titel"
-    basics_job_title_help: "Was für eine Stelle suchst du?"
-    basics_city: "Stadt"
-    basics_city_help: "Stadt in der du arbeiten möchtest (oder jetzt lebst)."
-    basics_country: "Land"
-    basics_country_help: "Land in dem du arbeiten möchtest (oder jetzt lebst)."
-    basics_visa: "US Arbeitserlaubnis"
-    basics_visa_help: "Bist du berechtigt in den USA zu arbeiten oder benötigst du Visa Sponsoring? (Wenn du in Kanada oder Australien lebst, markiere berechtigt.)"
-    basics_looking_for: "Suche nach"
-    basics_looking_for_full_time: "Vollzeit"
-    basics_looking_for_part_time: "Teilzeit"
-    basics_looking_for_remote: "Remote"
-    basics_looking_for_contracting: "Vertragsarbeit"
-    basics_looking_for_internship: "Praktikum"
-    basics_looking_for_help: "Was für eine Art Entwickler-Position suchst du?"
-    name_header: "Trage deinen Namen ein"
-    name_anonymous: "Anonymer Entwickler"
-    name_help: "Name den Arbeitgeber sehen sollen, z.B. 'Nick Winter'."
-    short_description_header: "Schreibe einen kurzen Text über dich"
-    short_description_blurb: "Füge eine Tagline hinzu, damit Arbeitgeber schnell mehr über dich erfahren können."
-    short_description: "Tagline"
-    short_description_help: "Wer bist du und wonach suchst du? 140 Zeichen max."
-    skills_header: "Fähigkeiten"
-    skills_help: "Markiere relevante Entwicklerfähigkeiten in der Reihenfolge deines Niveaus."
-    long_description_header: "Beschreibe deine gewünschte Position"
-    long_description_blurb: "Teile Arbeitgebern mit, wie toll du bist und nach welcher Position du suchst."
-    long_description: "Selbstbeschreibung"
-    long_description_help: "Beschreibe dich selbst für potentielle Arbeitgeber. Fasse dich kurz, aber treffend. Wir empfehlen die Position kurz darzustellen, die dich am meisten interessieren würde. Geschmackvoller Preisabschlag ist ok; max. 600 Zeichen."
-    work_experience: "Berufserfahrung"
-    work_header: "Liste deine Berufserfahrung chronologisch auf"
-    work_years: "Jahre der Erfahrung"
-    work_years_help: "Wie viele Jahre professionelle Erfahrung (bezahlte Arbeit) hast du mit der Entwicklung von Software?"
-    work_blurb: "Liste deine relevante Berufserfahrung auf, letzte Tätigkeit zuerst."
-    work_employer: "Arbeitgeber"
-    work_employer_help: "Name deines Arbeitgebers."
-    work_role: "Jobtitel"
-    work_role_help: "Was war dein Jobtitel oder deine Rolle?"
-    work_duration: "Dauer"
-    work_duration_help: "Wann warst du dort?"
-    work_description: "Beschreibung"
-    work_description_help: "Was hast du dort gemacht (140 Zeichen; optional)"
-    education: "Schulbildung"
-    education_header: "Erzähle von deinen akademischen Martyrien"
-    education_blurb: "Liste deine akademischen Martyrien."
-    education_school: "Schule"
-    education_school_help: "Name deiner Schule."
-    education_degree: "Abschluss"
-    education_degree_help: "Was war dein Abschluss und deine Fachrichtung?"
-    education_duration: "Daten"
-    education_duration_help: "Wann?"
-    education_description: "Beschreibung"
-    education_description_help: "Hebe etwas aus dieser Ausbildung hervor. (140 Zeichen; optional)"
-    our_notes: "CodeCombat's Notizen"
-    remarks: "Kommentare"
-    projects: "Projekte"
-    projects_header: "Füge 3 Projekte hinzu"
-    projects_header_2: "Projekte (Top 3)"
-    projects_blurb: "Hebe deine Projekte hervor, um Arbeitgeber zu verblüffen."
-    project_name: "Projekt Name"
-    project_name_help: "Wie wurde das Projekt genannt?"
-    project_description: "Beschreibung"
-    project_description_help: "Beschreibe kurz das Projekt."
-    project_picture: "Bild"
-    project_picture_help: "Lade ein 230x115px oder größeres Bild hoch, welches das Projekt darstellt."
-    project_link: "Link"
-    project_link_help: "Verlinke das Projekt."
-    player_code: "Spieler Code"
-
-  employers:
-    deprecation_warning_title: "Leider sucht CodeCombat derzeit keine neuen Mitarbeiter."
-    deprecation_warning: "Wir konzentrieren uns derzeit auf Anfängerlevel, statt Expertendeveloper zu finden."
-    hire_developers_not_credentials: "Stellen Sie Entwickler ein, nicht Qualifikationen." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Legen Sie los"
-    already_screened: "Wir haben alle Kandidaten bereits technisch geprüft"
-    filter_further: ", aber Sie können noch weiter filtern:"
-    filter_visa: "Visum"
-    filter_visa_yes: "US autorisiert"
-    filter_visa_no: "nicht autorisiert"
-    filter_education_top: "Top-Schule"
-    filter_education_other: "Andere"
-    filter_role_web_developer: "Web Entwickler"
-    filter_role_software_developer: "Software Entwickler"
-    filter_role_mobile_developer: "Mobile Entwickler"
-    filter_experience: "Erfahrung"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Vor kurzem promoviert"
-    filter_experience_student: "Student"
-    filter_results: "Ergebnisse"
-    start_hiring: "Beginnen Sie einzustellen."
-    reasons: "Drei Gründe warum Sie durch uns einstellen sollten:"
-    everyone_looking: "Jeder sucht hier nach der nächsten Herausforderung."
-    everyone_looking_blurb: "Vergessen Sie die 20% LinkedIn InMail Antwort-Raten. Jeden den wir auf unseren Webseite auflisten, sucht nach seinem nächsten Arbeitsplatz und wird Ihnen auf Ihre Kontaktanfrage antworten."
-    weeding: "Lehnen Sie sich zurück; wir haben das Aussortieren für Sie übernommen."
-    weeding_blurb: "Jeden Spieler, den wir auflisten, wurde bereits auf seine technischen Fähigkeiten geprüft. Wir führen auch Telefoninterviews mit ausgewählten Kandidaten durch und machen Notizen in ihrem Profil, um Ihnen Zeit zu ersparen."
-    pass_screen: "Sie werden Ihre technischen Tests bestehen."
-    pass_screen_blurb: "Prüfen Sie den Code jedes Kandidaten bevor Sie ihn kontaktieren. Ein Arbeitgeber fand heraus das bis zu 5 mal so viele unserer Entwickler sein technisches Screening bestanden als wenn er durch Hacker News eingestellt hätte."
-    make_hiring_easier: "Machen Sie bitte meinen Einstellungsprozess einfachen."
-    what: "Was ist CodeCombat?"
-    what_blurb: "CodeCombat ist ein Mehrspieler Browser-Programmierspiel. Spieler schreiben Code, um Ihre Armeen im Kampf gegen andere Entwickler zu steuern. Unsere Spieler haben Erfahrung mit allen wichtigen Tech-Stacks."
-    cost: "Wie viel berechnen wir?"
-    cost_blurb: "Wir berechnen 15% des ersten Jahresgehalts und bieten eine 100% Geld-Zurück-Garantie für 90 Tage an. Wir berechnen nicht für Kandidaten, die bereits aktiv an Ihrem Bewerbungsverfahren teilnehmen."
-    candidate_name: "Name"
-    candidate_location: "Standort"
-    candidate_looking_for: "Sucht nach"
-    candidate_role: "Rolle"
-    candidate_top_skills: "Top Fähigkeiten"
-    candidate_years_experience: "Erfahrung (Jahre)"
-    candidate_last_updated: "Zuletzt aktualisiert"
-    candidate_who: "Wer"
-    featured_developers: "Mitwirkende Entwickler"
-    other_developers: "Andere Entwickler"
-    inactive_developers: "Inaktive Entwickler"
-
   admin:
     av_espionage: "Spionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email oder Benutzername"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     av_entities_sub_title: "Entitäten"
     av_entities_users_url: "Benutzer"
     av_entities_active_instances_url: "Aktive Instanzen"
-    av_entities_employer_list_url: "Arbeitgeberliste"
-    av_entities_candidates_list_url: "Kandidatenliste"
     av_entities_user_code_problems_list_url: "User Code Problem-Liste"
     av_other_sub_title: "Sonstige"
     av_other_debug_base_url: "Base (um base.jade zu debuggen)"
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 860cc62ed..75226b459 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -4,7 +4,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     no_ie: "Το CodeCombat δεν είναι συμβατό με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση. Συγνώμη!" # Warning that only shows up in IE8 and older
     no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!" # Warning that shows up on mobile devices
     play: "Παίξε" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Παίξε σε Μορφή Εκστρατείας" # Shows up under big play button if you only play /courses
     old_browser: "Ωχ, ο περιηγητής σας είναι πολύ παλιός για να τρέξει το CodeCombat. Συγνώμη!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Μπορείτε να δοκιμάσετε, αλλά πιθανότατα να μην λειτουργήσει."
     ipad_browser: "Δυσάρεστα νέα: Το CodeCombat δεν τρέχει στο iPad μέσω περιηγητή. Ευχάριστα νέα: αναμένουμε την έγκριση της Apple για την εφαρμογή μας για iPad."
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     multiplayer: "Πολλαπλοί Παίκτες" # Not currently shown on home page
     for_developers: "Για προγραμματιστές" # Not currently shown on home page.
     or_ipad: "Ή κατεβάστε για iPad"
-    hoc_class_code: "Έχω Κωδικό Τάξης "
-    hoc_enter: "Είσοδος"
-    hoc_title: "Ώρα του Κώδικα?"
 
   nav:
     play: "Επίπεδα" # The top nav bar entry where players choose which levels to play
@@ -78,7 +75,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     subscription_required: "Απαιτείται εγγραφή"
     anonymous: "Ανώνυμοι Παίκτες"
     level_difficulty: "Δυσκολία: "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Παίξε σε Μορφή Μαθημάτων" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Εκστρατεία για Αρχάριους"
     awaiting_levels_adventurer_prefix: "Έχουμε νέα επίπεδα κάθε εβδομάδα."
     awaiting_levels_adventurer: "Εγγραφή ως Adventurer"
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     creating: "Δημιουργία Λογαριασμού..."
     sign_up: "Εγγραφή"
     log_in: "Σύνδεση με κωδικό"
-    social_signup: "Ή, μπορείς να συνδεθείς μέσω Facebook ή G+:"
     required: "Θα πρέπει να συνδεθείτε πριν πάτε προς τα εκεί."
     login_switch: "Έχεις ήδη λογαριασμό;"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "Ονομα Σχολείου και Πόλη"
+    optional: "Προαιρετικό"
+    school_name_placeholder: "Παράδειγμα ΕΠΑΛ Καλύμνου, Κάλυμνος"
 
   recover:
     recover_account_title: "Ανάκτηση λογαριασμού"
@@ -244,12 +240,10 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     incomplete: "Ατελές"
     timed_out: "Έμεινες από χρόνο"
     failing: "Αποτυγχάνει"
-    action_timeline: "Χρονοδιάγραμμα δράσης"
-    click_to_select: "Κάντε κλικ σε μια μονάδα για να το επιλέξετε."
     control_bar_multiplayer: "πολλαπλών παικτών"
     control_bar_join_game: "Παίξε κι εσύ"
     reload: "Επαναφόρτωση"
-    reload_title: "Ανανέωση όλου του κωδικά;"
+    reload_title: "Ανανέωση όλου του κώδικα;"
     reload_really: "Είσαι σίγουρος ότι θέλεις να φορτώσεις αυτό το επίπεδο από την αρχή;"
     reload_confirm: "Ανανέωση όλων"
     victory: "Νίκη"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     parents_title: "Αγαπητέ Γονέα: Το παιδί σας μαθαίνει να προγραμματίζει ηλεκτρονικούς υπολογιστές. Θα το βοηθήσετε να συνεχίσει;"
     parents_blurb1: "Το παιδί σας έχει παίξει  __nLevels__ επίπεδα και έχει μάθει τα βασικά του προγραμματισμού. Βοηθήστε το να καλλιεργήσει το ενδιαφέρον του και αγοράστε του μια συνδρομή για να συνεχίσει να παίζει."
     parents_blurb1a: "Ο προγραμματισμός υπολογιστών είναι μια αναγκαία ικανότητα, το οποίο το παιδί σας σίγουρα χρησιμοποιήσει ως ανήλικας. Έως το 2020, το 77% των δουλειών θα απαιτούν βασικές ικανότητες σε λογισμικό, και οι προγραμματιστές έχουν μεγάλη ζήτηση ανά την υφήλιο. Ξέρετε ότι η Επιστήμη Υπολογιστώνείναι το πιο καλοπληρωμένο πτυχίο πανεπιστημίου;"
-    parents_blurb2: "Για $9.99 Δολλάρια ΗΠΑ/μήνα, το παιδί σας θα έχει νέες προκλήσεις κάθε εβδομάδα και προσωπική υποστήριξη μέσω ηλεκτρονικού ταχυδρομείου από επαγγελματίες προγραμματιστές."
+    parents_blurb2: "Για ${{price}} Δολλάρια ΗΠΑ/μήνα, το παιδί σας θα έχει νέες προκλήσεις κάθε εβδομάδα και προσωπική υποστήριξη μέσω ηλεκτρονικού ταχυδρομείου από επαγγελματίες προγραμματιστές."
     parents_blurb3: "Κανένα Ρίσκο: 100% εγγύση επιστροφής χρημάτων, εύκολη διακοπή συνδρομής, με 1 κλικ."
     payment_methods: "Τρόποι Πληρωμής"
     payment_methods_title: "Αποδεκτοί Τρόποι Πληρωμής"
     payment_methods_blurb1: "Προς το παρόν δεχόμαστε πιστωτικές κάρτες και Alipay." # {change}
     payment_methods_blurb2: "Αν ενδιαφέρεστε για άλλο τρόπο πληρωμής, παρακαλούμε επικοινωνείστε μαζί μας."
-    sale_already_subscribed: "Είστε ήδη συνδρομητής!"
-    sale_blurb1: "Γλίτωσε $21" # {change}
-    sale_blurb2: "από την τιμή της κανονικής συνδρομής των $120 το χρόνο!"
     sale_button: "Εκπτώσεις!"
-    sale_button_title: "Γλίτωσε $21 όταν αγοράσεις συνδρομή ετήσια συνδρομή" # {change}
-    sale_click_here: "Πάτα εδώ"
-    sale_ends: "Τελειώνει"
-    sale_extended: "*Οι υπάρχουσες συνδρομές θα επεκταθούν για ένα χρόνο."
-    sale_feature_here: "Θα αποκτήσετε τα παρακάτω:"
-    sale_feature2: "Πρόσβαση σε 9 παντοδύναμους <strong>νέους ήρωες</strong> με μοναδικές ικανότητες!"
-    sale_feature4: "Θα έχετε άμεσα <strong>42.000 πετράδια</strong>!"
-    sale_continue: "Είσαι έτοιμος να συνεχίσεις την περιπέτεια;"
-    sale_limited_time: "Η προσφορά θα διαρκέσει μόνο για λίγο!"
-    sale_new_heroes: "Νέοι ήρωες!"
-    sale_title: "Εκπτώσεις λόγω επιστροφής στο Σχολείο"
-    sale_view_button: "Αγόρασε ετήσια συνδρομή για"
+    sale_button_title: "Γλίτωσε ${{discount}} όταν αγοράσεις συνδρομή ετήσια συνδρομή" # {change}
     stripe_description: "Μηνιαία Συνδρομή"
-    stripe_description_year_sale: "Ετήσια Συνδρομή ($21 έκπτωση)" # {change}
+    stripe_description_year_sale: "Ετήσια Συνδρομή (${{discount}} έκπτωση)" # {change}
     subscription_required_to_play: "Πρέπει να είσαι συνδρομητής για να παίξεις αυτό το επίπεδο."
     unlock_help_videos: "Απέκτησε συνδρομή για να ξεκλειδώσεις όλα τα βίντεο βοηθήματα."
     personal_sub: "Προσωπική Συνδρομή" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     currently_free_until: "Η συνδρομή σας λήγει στις"
     was_free_until: "Είχατε δωρεάν συνδρομή μέχρι τις"
     managed_subs: "Συνδρομές που διαχειρίζεστε"
-    managed_subs_desc: "Προσθέστε συνδρομές για άλλους παίκτες (μαθητές, παιδιά, κπλ.)"
-    managed_subs_desc_2: "Οι αποδέκτες πρέπει να έχουν λογαριασμό στο CodeCombat με τη διεύθυνση ηλεκτρονικού ταχυδρομείου που δώσατε."
-    group_discounts: "Ομαδικές εκπτώσεις"
-    group_discounts_1: "Παρεχουμε ομαδικές εκπτώσεις για πολλαπλές συνδρομές."
-    group_discounts_1st: "1η συνδρομή"
-    group_discounts_full: "Πλήρης τιμή"
-    group_discounts_2nd: "2-11 συνδρομές"
-    group_discounts_20: "20% έκπτωση"
-    group_discounts_12th: "12+ συνδρομές"
-    group_discounts_40: "40% έκπτωση"
     subscribing: "Δημιουργία συνδρομής..."
-    recipient_emails_placeholder: "Παρακαλώ συμπληρώστε διεύθυνση ηλεκτρονικού ταχυδρομείογια συνδρομή, μια ανά γραμμή."
-    subscribe_users: "Συνδρομή Χρηστών"
-    users_subscribed: "Εγγεγραμένοι Χρήστες:"
-    no_users_subscribed: "Δε δημιουργήθηκε συνδρομη για κανένα χρήστη, παρακαλώ ελέγξτε ξανά τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας."
     current_recipients: "Αποδέκτες"
     unsubscribing: "Κατάργηση συνδρομής"
     subscribe_prepaid: "Πατήστε Συνδρομή για να χρησιμποιήσετε τον προπληρωμένο κωδικό"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Περισσότερες Πληροφορίες για Εκπαιδευτικούς"
-    intro_1: "Το CodeCombat είναι ένα παιχνίδι που διδάσκει προγραμματισμό Η/Υ. Οι μαθητές γράφουν κώδικα σε κανονικές γλώσσες προγραμματισμού."
-    intro_2: "Δε χρειάζεται προηγούμενη εμπειρία!"
-    free_title: "Πόσο κοστίζει"
-    cost_premium_server: "Το CodeCombat είναι δωρεάν για τα πέντε πρώτα επίπεδα, μετά τα οποία κοστίζει $9.99 Δολλάρια ΗΠΑ το μήνα για να έχετε πρόσβαση στα πάνω από 190 επίπεδα στους αποκλειστικούς για τη χώρα εξυπηρετητές."
-    free_1: "Υπάρχουν πάνω από 100 ΔΩΡΕΑΝ επίπεδα που καλύπτουν όλα τα αντικείμενα."
-    free_2: "Η μηνιαία συνδρομή παρέχει πρόσβαση σε βίντεο βοηθήματα και παραπάνω επίπεδα για εξάσκηση."
-    free_3: "Το περιεχομένο του CodeCombat χωρίζεται σε"
-    free_4: "μαθήματα"
-    free_5: ".   Η πρώτη σειρά μαθημάτων είναι δωρεάν και περιέχει περίπου μια ώρα υλικού."
-    free_6: "Πρόσβαση σε πρόσθετα μαθημάτα μπορεί να αποκτηθεί με αγορά συνδρομής."
-    teacher_subs_title: "Οι εκπαιδευτικοί παίρνουν δωρεάν συνδρομές!" # {change}
-    teacher_subs_0: "Προσφέρουμε δωρεάν συνδρομές σε εκπαιδευτικούς για να μπορέσουν να αξιολογήσουν το παιχνίδι." # {change}
-    teacher_subs_1: "παρακαλούμε συμπληρώστε το"
-    teacher_subs_2: "Ερωτηματολόγιο Εκπαιδευτικών"
-    teacher_subs_3: "για να δημιουργήσουμε τη συνδρομή σας." # {change}
-    sub_includes_title: "Τι περιλαμβάνει η συνδρομή;"
-    sub_includes_1: "Επιπλέον των πάνω από 110 βασικά επίπεδα, οι μαθητές που έχουν μηνιαία συνδρομή έχουν πρόσβαση και στα ακόλουθα μοναδικά χαρακτηριστικά:"
-    sub_includes_2: "Πάνω από 80 επίπεδα για εξάσκηση"
-    sub_includes_3: "Βίντεο βοηθήματα"
-    sub_includes_4: "Προνομιακή υποστήριξη μέσω ηλεκτρονικού ταχυδρομείου"
-    sub_includes_5: "10 νέους ήρωες με μοναδικές ικανότηες"
-    sub_includes_6: "Δώρο 3500 πετράσια κάθε μήνα"
-    sub_includes_7: "Ιδιωτικές Φατρίες"
-    monitor_progress_title: "Πως μπορώ να παρακολουθώ την πρόοδο των μαθητών;"
-    monitor_progress_1: "Μπορείτε να παρακολουθείτε την πρόοδο των μαθητών δημιουργόντας μια"
-    monitor_progress_2: "για την τάξη σας."
-    monitor_progress_3: "Για να προσθέσεις ένα μαθητή, στείλε του μια πρόσκληση για τη Φατρία σου, που είναι στην "
-    monitor_progress_4: "σελίδα."
-    monitor_progress_5: "Αφού γίνουν μέλη, θα δεις μια περίληψη της προόδου του μαθητή στη σελίδα της φατρίας σου."
-    private_clans_1: "Οι ιδιωτικές φατρίες παρέχουν αυξημένη ιδιωτικήτητα και λεπτομερίς πληροφορίες προόδου για κάθε ένα μαθητή."
-    private_clans_2: "Για να φτιάξεις μια ιδωιτική φατρία, τσέκαρε το 'Κάνε τη φατρία ιδιωτική' όταν φτιάχνεις μια"
-    private_clans_3: "."
     who_for_title: "Για ποιον είναι το CodeCombat;"
-    who_for_1: "Προτείνουμε το CodeCombat για μαθητές από 9 χρονών και πάνω. Δεν απαιτείται προηγούμενη πείρα στον προγραμματισμό."
-    who_for_2: "Σχεδιάσαμε το CodeCombat και για αγόρια και για κορίτσια."
-    material_title: "Πόσο υλικό υπάρχει;"
-    material_premium_server: "Περίπου 50 ώρες παιχνιδιού, με πάνω από 190 επίπεδα μόνο για συνδρομητές, μέχρι τώρα."
-    material_1: "Περίπου 25 ώρες δψρεάν περιεχομένου και επιπλέον 15 ώρες συνδρομητικού περιεχομένου."
-    concepts_title: "Ποια θέματα καλύπτονται;"
-    how_much_title: "Πόσο κοστίζει μια μηνιαία συνδρομή;"
-    how_much_1: "Μια"
-    how_much_2: "μηνιαία συνδρομή"
-    how_much_3: "κοστίζει $9.99 δολλάρια ΗΠΑ, και μπορεί να ακυρωθεί οποιαδήποτε στιγμή."
-    how_much_4: "Επιπλεέον, προσφέρουμε εκπτώσεις για μεγαλύτερες ομάδες:"
-    how_much_5: "Δεχόμαστε αγορές με έκπτωση, μόνο για μια φορά, και ετήσιες συνδρομέςγια ομάδες, όπως μια τάξη ή ένα σχολείο. Παρακαλούμε επικοινωνείστε"
-    how_much_6: "για περισσότερες πληροφορίες."
+    who_for_1: "Προτείνουμε το CodeCombat για μαθητές από 9 χρονών και πάνω. Δεν απαιτείται προηγούμενη πείρα στον προγραμματισμό." # {change}
+    who_for_2: "Σχεδιάσαμε το CodeCombat και για αγόρια και για κορίτσια." # {change}
     more_info_title: "Που μπορώ να βρω περισσότερες πληροφορίες"
     more_info_1: "Το"
     more_info_2: "φόρουμ των εκπαιδευτικών"
     more_info_3: "είναι ένα καλό σημείο για να συνδεθείτε με άλλους εκπαιδευτικούς που χρησιμοποιούν το CodeCombat."
-    sys_requirements_title: "Απαιτήσεις Συστήματος"
-    sys_requirements_1: "Ένας σύγχρονος φυλλομετρητής. Οι νεώτερες εκδόσεις των Chrome, Firefox, ή Safari. Ο Internet Explorer από την έκδοση 9 και μετά."
-    sys_requirements_2: "Το CodeCombat δεν υποστηρίζεται ακόμα στο iPad."
 
   teachers_survey:
     title: "Έρευνα Εκπαιδευτικών"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     screenshot_included: "Θα συμπεριλάβουμε και στιγμιότυπα οθόνης."
     where_reply: "Σε ποια διεύθυνση να απαντήσουμε;"
     send: "Αποστολή σχολίων"
-    contact_candidate: "Επικοινώνησε με τον Υποψήφιο" # Deprecated
-    recruitment_reminder: "Χρησιμοποίησε τη φόρμα αυτή για να επικοινωνήσεις με τους υποψήφιους, από τους οποίους ενδιαφέρεσαι να πάρεις συνέντευξη. Υπενθυμίζουμε πως το CodeCombat χρεώνει το 15% της αμοιβής του πρώτου έτους. Η καταβολή του ποσού γίνεται με την πρόσληψη του εργαζομένου, και μπορεί να επιστραφεί εντός 90 ημερών, στην περίπτωση που ο εργαζόμενος δεν παραμείνει στην εργασία. Οι μερικής απασχόλησης, οι εργαζόμενοι εξ αποστάσεως (τηλε-εργασία), οι μπλοκάκηδες και οι πρακτικάριοι είναι δωρεάν." # Deprecated
 
   account_settings:
     title: "Ρυθμίσεις λογαριασμού"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     saved: "Οι αλλαγές αποθηκεύτηκαν"
     password_mismatch: "Οι κωδικοί δεν ταιριάζουν"
     password_repeat: "Παρακαλώ επαναλάβετε τον κωδικό σας."
-    job_profile: "Προφίλ Δουλειάς" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Το προφίλ εργασίας έχει έχει εγκριθεί από το CodeCombat. Οι εργοδότες θα μπορούν να το βλέπουν μέχρι να το μαρκάρεις σαν ανενεργό ή να μην έχει αλλαχθεί για 4 εβδομάδες."
-    job_profile_explanation: "Γεια! Συμπλήρωσε το παρακάτω, και θα επικοινωνήσουμε μαζί σου για το πως θα βρεις μια δουλειά ως προγραμματιστής."
-    sample_profile: "Δες ένα δοκιμαστικό προφίλ"
-    view_profile: "Προβολή του προφίλ σου"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Συντομεύσεις πληκτρολογίου"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     subs_only: "μόνο για συνδρομητές"
     create_clan: "Δημιουργία Νέας Φατρίας"
     private_preview: "Προεπισκόπηση"
+#    private_clans: "Private Clans"
     public_clans: "Δημόσιες Φατρίες"
     my_clans: "Οι Φατρίες Μου"
     clan_name: "Όνομα Φατρίας"
@@ -855,7 +770,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     started_2: "Ξεκίνησε"
     not_started_2: "Δεν ξεκίνησε"
     view_solution: "Πάτα για να δεις τη λύση."
-#    view_attempt: "Click to view attempt."
+    view_attempt: "Κλικ για να δείς την προσπάθεια."
     latest_achievement: "Τελευταίο Επίτευγμα"
     playtime: "Χρόνος παιχνιδιού"
     last_played: "Έπαιξε τελευταία φορά"
@@ -877,7 +792,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
   courses:
     course: "Μάθημα"
     courses: "μαθήματα"
-#    create_new_class: "Create New Class"
+    create_new_class: "Δημιουργια Νεας Ταξης"
     not_enrolled: "Δεν έχετε εγγραφεί στο μάθημα αυτό."
     visit_pref: "Παρακαλώ επισκεφτείτε τη "
     visit_suf: "σελίδα για να εγγραφείτε."
@@ -952,149 +867,152 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     topics: "Θέματα"
     hours_content: "Ώρες περιεχομένου:"
     get_free: "Πάρε ΔΩΡΕΑΝ μάθημα"
-#    enroll_paid: "Enroll Students in Paid Courses"
-#    you_have1: "You have"
-#    you_have2: "unused paid enrollments"
-#    use_one: "Use 1 paid enrollment for"
-#    use_multiple: "Use paid enrollments for the following students:"
-#    already_enrolled: "already enrolled"
-#    licenses_remaining: "licenses remaining:"
-#    insufficient_enrollments: "insufficient paid enrollments"
-#    enroll_students: "Enroll Students"
-#    get_enrollments: "Get More Enrollments"
-#    change_language: "Change Course Language"
-#    keep_using: "Keep Using"
-#    switch_to: "Switch To"
-#    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
-#    back_classrooms: "Back to my classrooms"
-#    back_courses: "Back to my courses"
-#    edit_details: "Edit class details"
-#    enrolled_courses: "enrolled in paid courses:"
-#    purchase_enrollments: "Purchase Enrollments"
-#    remove_student: "remove student"
-#    assign: "Assign"
-#    to_assign: "to assign paid courses."
-#    teacher: "Teacher"
-#    complete: "Complete"
-#    none: "None"
-#    save: "Save"
-#    play_campaign_title: "Play the Campaign"
-#    play_campaign_description: "You’re ready to take the next step! Explore hundreds of challenging levels, learn advanced programming skills, and compete in multiplayer arenas!"
-#    create_account_title: "Create an Account"
-#    create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!"
-#    preview_campaign_title: "Preview Campaign"
-#    preview_campaign_description: "Take a sneak peek at all that CodeCombat has to offer before signing up for your FREE account."
-#    arena: "Arena"
-#    arena_soon_title: "Arena Coming Soon"
-#    arena_soon_description: "We are working on a multiplayer arena for classrooms at the end of"
-#    not_enrolled1: "Not enrolled"
-#    not_enrolled2: "Ask your teacher to enroll you in the next course."
-#    next_course: "Next Course"
-#    coming_soon1: "Coming soon"
-#    coming_soon2: "We are hard at work making more courses for you!"
-#    available_levels: "Available Levels"
-#    welcome_to_courses: "Adventurers, welcome to Courses!"
-#    ready_to_play: "Ready to play?"
-#    start_new_game: "Start New Game"
-#    play_now_learn_header: "Play now to learn"
-#    play_now_learn_1: "basic syntax to control your character"
-#    play_now_learn_2: "while loops to solve pesky puzzles"
-#    play_now_learn_3: "strings & variables to customize actions"
-#    play_now_learn_4: "how to defeat an ogre (important life skills!)"
-#    welcome_to_page: "Welcome to your Courses page!"
-#    completed_hoc: "Amazing! You've completed the Hour of Code course!"
-#    ready_for_more_header: "Ready for more? Play the campaign mode!"
-#    ready_for_more_1: "Use gems to unlock new items!"
-#    ready_for_more_2: "Play through brand new worlds and challenges"
-#    ready_for_more_3: "Learn even more programming!"
-#    saved_games: "Saved Games"
-#    hoc: "Hour of Code"
-#    my_classes: "My Classes"
-#    class_added: "Class successfully added!"
-#    view_class: "view class"
-#    view_levels: "view levels"
-#    join_class: "Join A Class"
-#    ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:"
-#    enter_c_code: "<Enter Class Code>"
-#    join: "Join"
-#    joining: "Joining class"
-#    course_complete: "Course Complete"
-#    play_arena: "Play Arena"
-#    start: "Start"
-#    last_level: "Last Level"
-#    welcome_to_hoc: "Adventurers, welcome to our Hour of Code!"
-#    logged_in_as: "Logged in as:"
-#    not_you: "Not you?"
-#    welcome_back: "Hi adventurer, welcome back!"
-#    continue_playing: "Continue Playing"
-#    more_options: "More options:"
-#    option1_header: "Option 1: Invite students via email"
-#    option1_body: "Students will automatically be sent an invitation to join this class, and will need to create an account with a username and password."
-#    option2_header: "Option 2: Send URL to your students"
-#    option2_body: "Students will be asked to enter an email address, username and password to create an account."
-#    option3_header: "Option 3: Direct students to codecombat.com/courses"
-#    option3_body: "Give students the following passcode to enter along with an email address, username and password when they create an account."
-#    thank_you_pref: "Thank you for your purchase! You can now assign"
-#    thank_you_suff: "more students to paid courses."
-#    return_to_class: "Return to classroom"
-#    return_to_course_man: "Return to course management."
-#    students_not_enrolled: "students not enrolled"
-#    total_all_classes: "Total Across All Classes"
-#    how_many_enrollments: "How many additional paid enrollments do you need?"
-#    each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually."
-#    purchase_now: "Purchase Now"
-#    enrollments: "enrollments"
-#    remove_student1: "Remove Student"
-#    are_you_sure: "Are you sure you want to remove this student from this class?"
-#    remove_description1: "Student will lose access to this classroom and assigned classes. Progress and gameplay is NOT lost, and the student can be added back to the classroom at any time."
-#    remove_description2: "The activated paid license will not be returned."
-#    keep_student: "Keep Student"
-#    removing_user: "Removing user"
-#    to_join_ask: "To join a class, ask your teacher for an unlock code."
-#    join_this_class: "Join Class"
-#    enter_here: "<enter unlock code here>"
-#    successfully_joined: "Successfully joined"
-#    click_to_start: "Click here to start taking"
-#    my_courses: "My Courses"
-#    classroom: "Classroom"
-#    use_school_email: "use your school email if you have one"
-#    unique_name: "a unique name no one has chosen"
-#    pick_something: "pick something you can remember"
-#    class_code: "Class Code"
-#    optional_ask: "optional - ask your teacher to give you one!"
-#    optional_school: "optional - what school do you go to?"
-#    start_playing: "Start Playing"
-#    skip_this: "Skip this, I'll create an account later!"
-#    welcome: "Welcome"
-#    getting_started: "Getting Started with Courses"
-#    download_getting_started: "Download Getting Started Guide [PDF]"
-#    getting_started_1: "Create a new class by clicking the green 'Create New Class' button below."
-#    getting_started_2: "Once you've created a class, click the blue 'Add Students' button."
-#    getting_started_3: "You'll see student's progress below as they sign up and join your class."
-#    additional_resources: "Additional Resources"
-#    additional_resources_1_pref: "Download/print our"
-#    additional_resources_1_mid: "Course 1 Teacher's Guide"
-#    additional_resources_1_suff: "explanations and solutions to each level."
-#    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
-#    additional_resources_3_pref: "Visit our"
-#    additional_resources_3_mid: "Teacher Forums"
-#    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
-#    your_classes: "Your Classes"
-#    no_classes: "No classes yet!"
-#    create_new_class1: "create new class"
-#    available_courses: "Available Courses"
-#    unused_enrollments: "Unused enrollments available:"
-#    students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses."
+    enroll_paid: "Γράψε  μαθητές σε μαθήματα με πληρωμή"
+    you_have1: "Έχεις"
+    you_have2: "αχρησιμοποιήτες πληρωμένες συνδρομές"
+    use_one: "Χρησιμοποιήσε 1 πληρωμένη συνδρομή για"
+    use_multiple: "Χρησιμοποιήσε τις πληρωμένη συνδρομές για τους παρακάτω μαθητές:"
+    already_enrolled: "Ήδη εγγεγραμένος"
+    licenses_remaining: "Συνδρομές που απομένουν:"
+    insufficient_enrollments: "Δεν αρκούν οι πληρωμένες συνδρομές"
+    enroll_students: " Γράψε Μαθητές"
+    get_enrollments: "Ζήτα και αλλές εγγραφές"
+    change_language: "Αλλαγή Γλώσσας Μαθήματος"
+    keep_using: "Συνέχισε να χρησιμοποιείς"
+    switch_to: "Αλλαγή σε"
+    greetings: "Καλως ΄Ηρθες!"
+    learn_p: "Μάθε Python"
+    learn_j: "Μάθε JavaScript"
+    language_cannot_change: "Η γλώσσα δεν μπορεί να αλλάξει από τη στιγμή που οι μαθητές θα συνδεθούν με την τάξη."
+    back_classrooms: "Πίσω στις τάξεις μου"
+    back_courses: "Πίσω στα μαθήματα μου"
+    edit_details: "Επεξεργασία Ρυθμίσεων Τάξης"
+    enrolled_courses: "Εγγεγραμμένοι σε μαθήματα με πληρωμή:"
+    purchase_enrollments: "Αγόρασε Συνδρομές επί πληρωμή"
+    remove_student: "Διαγραφή Μαθητή"
+    assign: "Ανάθεση"
+    to_assign: "Ανάθεση μαθημάτων επί πληρωμή."
+    teacher: "Δάσκαλος"
+    complete: "Ολοκληρωμένο"
+    none: "Κανένα"
+    save: "Αποθήκευση"
+    play_campaign_title: "Παίξε την Εκστρατεία"
+    play_campaign_description: "Είσαι έτοιμος να κάνει το επόμενο βήμα! Εξερευνήστε εκατοντάδες επίπεδα γεμάτα με νεές προκλήσεις, αποκτώνγτας προηγμένες γνώσεις προγραμματισμού, και ανταγωνιστείτε σε αρένες με άλλους παίκτες!"
+    create_account_title: "Δημιουργία Λογαριασμού"
+    create_account_description: "Εγγραφείτε για ένα Δωρέαν CodeCombat λογαριασμό και κερδίστε πρόσβαση σε περισσότερα επίπεδα και προγραμματιστικές τεχνικές και φυσικά περισσότερη διασκέδαση!"
+    preview_campaign_title: "Προεπισκόπηση Εκστρατείας"
+    preview_campaign_description: "Ρίξτε μια κλεφτή ματιά σε όλα όσα το CodeCombat έχει να προσφέρει πριν από την εγγραφή σας για το ΔΩΡΕΑΝ λογαριασμό."
+    arena: "Αρενα"
+    arena_soon_title: "Σύντομα Έρχεται Αρένα"
+    arena_soon_description: "Κατασκευάζουμε μια αρένα πολλών παικτών για τάξεις στο τέλος του"
+    not_enrolled1: "Όχι εγγεγραμμένος"
+    not_enrolled2: "Ζήτα από το δάσκαλο σου να σε εγγράψει στο επόμενο μάθημα."
+    next_course: "Επόμενο Μάθημα"
+    coming_soon1: "Έρχεται Σύντομα"
+    coming_soon2: "Εργαζόμαστε σκληρά, φτιάχνοντας νέα μαθήματα για εσάς!"
+    available_levels: "Διαθέσιμα Επίπεδα"
+    welcome_to_courses: " Εξερευνητές καλωσήρθατε στις Σειρές Μαθημάτων!"
+    ready_to_play: "Έτοιμος να παίξεις?"
+    start_new_game: " Ξεκίνα Νέο Παιχνίδι"
+    play_now_learn_header: "Παίξε για να μάθεις"
+    play_now_learn_1: "Βασικό συντακτικό για τον έλεγχο του ήρωα σου."
+    play_now_learn_2: "Επαναληπτικοί Βρόχοι While για να λύνεις βαρετούς γρίφους"
+    play_now_learn_3: "συμβολοσειρές και μεταβλητές για να τροποποιείς εύκολα τις ενέργειες σου"
+    play_now_learn_4: " Πως να νικησεις ένα Ogre(απαραίτητο μάθημα επιβίωσης!)"
+    welcome_to_page: "Καλως ήρθες στη σελίδα των μαθημάτων σου!"
+    completed_hoc: "Καταπληκτικό! Ολοκλήρωσες την ώρα του κώδικα!"
+    ready_for_more_header: "Έτοιμος για περισσότερα? Παίξε στις Εκστρατείες!"
+    ready_for_more_1: "Χρησιμοποιήσε τα πετράδια για να ξεκλειδώσεις νέα αντικείμενα!"
+    ready_for_more_2: "Παίξε σενέους κόσμους κυνηγώντας καινούριες προκλήσεις"
+    ready_for_more_3: "Μάθε περισσότερα πάνω στο Προγραμματισμό!"
+    saved_games: "Αποθηκευμένα Παιχνίδια"
+    hoc: "Ώρα του Κώδικα"
+    my_classes: "Οι Τάξεις μου"
+    class_added: "Τάξη Προστέθηκε!"
+    view_class: "Ελέγχος Τάξης"
+    view_levels: "Ελέγχος Επίπεδων"
+    join_class: "Σύνδεση με Τάξη"
+    ask_teacher_for_code: "Ζήτα από το δάσκαλο σου, εάν έχει ένα κωδικό τάξης για το CodeCombat! Εάν έχει, πληκτρολόγησε το παρακάτω:"
+    enter_c_code: "<Πληκτρολόγησε Κωδικό Τάξης>"
+    join: "Σύνδεση"
+    joining: "Σύνδεση με Τάξη"
+    course_complete: "Μάθημα Ολοκληρωμένο"
+    play_arena: "Παίξε στην Αρένα"
+    start: "Εκκίνηση"
+    last_level: "Προηγουμένο Επίπεδο"
+    welcome_to_hoc: "Εξερευνητές, καλωσήρθατε στη δικιά μας Ώρα του Κώδικα!"
+    logged_in_as: "Υπογράφεις ως:"
+    not_you: "Δεν είσαι εσύ?"
+    welcome_back: "Γειά σου εξερευνητή καλωσήρθες πίσω!"
+    continue_playing: "Συνέχιση Παιχνιδιού"
+    more_options: "Περισσότερες Επιλογές:"
+    option1_header: "Επιλογή 1: Πρόσκληση στους μαθητές μέσω email"
+    option1_body: "Οι μαθητές θα λάβουν αυτομάτα μια πρόσκληση να συνδεθούν με την τάξηε, θα χρειαστεί να δημιουργήσουν ένα λογαριασμό με όνομα χρήστη και κωδικό πρόσβασης."
+    option2_header: "Επιλογή 2: Στείλε το URL στους μαθητές σου"
+    option2_body: "Από τους μαθητές θα ζητηθεί να εισάγουν μια διεύθυνση email, καθώς και όνομα χρήστη με κωδικό πρόσβασης."
+    option3_header: "Επιλογή 3: Καθοδήγησε τους μαθητές σου στο codecombat.com/courses"
+    option3_body: "Δώσε στους μαθητές σου τον κωδικό που ακολουθεί για να το χρησιμοποιήσουν όταν θα δημιουργούν ένα λογαριασμό."
+    thank_you_pref: "Ευχαριστούμε για την αγορά σου! Μπορείς τώρα να εκχωρήσεις"
+    thank_you_suff: "και άλλους μαθητές στα μαθήματα επί πληρωμή."
+    return_to_class: "Επιστροφή στην Τάξη"
+    return_to_course_man: "Επιστροφή στη Διαχείριση Τάξης."
+    students_not_enrolled: "μαθητές όχι εγγεγραμμένοι"
+    total_all_classes: "Σύνολο σε όλες τις τάξεις"
+    how_many_enrollments: "Πόσες ακόμα συνδρομές θα χρειαστείς?"
+    each_student_access: " Κάθε μαθητής στην τάξη θα αποκτήσει πρόσβαση στα Μαθήματα 2-4 μόλις συνδεθούν με τα μαθήματα επί πληρωμή. Μπορείς να συνδέεις κάθε μάθημα με κάθε μαθητή ξεχωριστά."
+    purchase_now: "Αγορά Τώρα"
+    enrollments: "Συνδρομές"
+    remove_student1: "Διαγραφή Μαθητή"
+    are_you_sure: "Είσαι σίγουρος ότι θέλεις να διαγράψεις τον μαθητή από αυτή την τάξη?"
+    remove_description1: "Ο μαθητής θα χάσει την πρόσβαση σε αυτή την τάξη και στα συνδεμένα μαθήματα. Η πρόοδος και το gameplay δεν θα χαθούν, και ο μαθητής μπορεί να προστεθεί πίσω στην τάξη, ανά πάσα στιγμή."
+    remove_description2: "Η ενεργοποιημένη πληρωμένη συνδρομή δεν πρόκειται να επιστραφεί."
+    keep_student: "Keep Student"
+    removing_user: "Διαγραφή χρήστη"
+    to_join_ask: "Για να συνδεθείς με μία τάξη, ζήτα από το δάσκαλο σου τον κώδικο τάξης."
+    join_this_class: "Σύνδεση με Τάξη"
+    enter_here: "<Πληκτρόλογησε κωδικό τάξης εδώ>"
+    successfully_joined: "Επιτυχώς Συνδέθηκες"
+    click_to_start: "Κλικ εδώ για να ξεκινήσεις"
+    my_courses: "Μαθήματα μου"
+    classroom: "Τάξη"
+    use_school_email: "Χρησιμοποιήσε ένα email"
+    unique_name: "Ένα όνομα μοναδικό"
+    pick_something: "Διάλεξε κάτι που θα θυμάσαι"
+    class_code: "Κωδικός Τάξης"
+    optional_ask: "Προαιρετικό - ζήτα από το δάσκαλο σου να σου δώσει ένα!"
+    optional_school: "Προαιρετικό - σε ποιό σχολείο πηγαίνεις?"
+    start_playing: "Ξεκίνα να Παίζεις"
+    skip_this: "Πάραλειψε τοs, θα δημιουργήσω λογαριασμό αργότερα!"
+    welcome: "Καλώς Ήρθες"
+    getting_started: "Ξεκινώντας με τις Σειρές Μαθημάτων"
+    download_getting_started: "Κατέβασε Getting Started Guide [PDF]"
+    getting_started_1: "Δημιούργησε μία νέα τάξη κάνοντας κλικ στο πράσινο κουμπί <Δημιουργία Τάξης> παρακάτω."
+    getting_started_2: "Μόλις δημιουργήσετε την τάξη, κλικ στο μπλε κουμπί για να προσθέσετε μαθητές."
+    getting_started_3: "Θα βλέπεις την πρόοδο των μαθητών σου μόλις ολοκληρώσουν την εγγραφή τους και συνδεθούν με την τάξη σου."
+    additional_resources: "Additional Resources"
+    additional_resources_1_pref: "Κατέβασε/Εκτύπωσε"
+    additional_resources_1_mid: "Οδηγός Εκπαιδευτικού για Μάθημα 1"
+    additional_resources_1_suff: "Επεξηγήσεις και λύσεις για το κάθε επίπεδο."
+    additional_resources_2_pref: "Συμπλήρωσε την"
+    additional_resources_2_suff: "για να κερδίσεις 15 ακόμα ώρες υλικού Δωρεάν για 2 μήνες."
+    additional_resources_3_pref: "Επισκέψη"
+    additional_resources_3_mid: "στα Forums των εκπαιδευτικών"
+    additional_resources_3_suff: "για να επικοινωνήσεις με άλλους συναδέρφους που χρησιμοποιούν το CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
+    your_classes: "Οι Τάξεις σου"
+    no_classes: "Όχι Τάξεις ακόμα!"
+    create_new_class1: "δημιουργία Τάξης"
+    available_courses: "Διαθέσιμα Μαθήματα"
+    unused_enrollments: "Αδιάθετες συνδρομές:"
+    students_access: "Όλοι οι μαθητές να έχουν πρόσβαση στην ενότητα Εισαγωγή στην Επιστήμη των Υπολογιστών δωρεάν. Μία συνδρομή ανά φοιτητή είναι υποχρεωτική για να να τους τοποθετήσετε στα μαθήματα που απαιτούν πληρωμή.Μία συνδρομή ανα μαθητή είναι αρκετή για την εγγραφή του σε όλα τα μαθήματα."
 #    active_courses: "active courses"
-#    no_students: "No students yet!"
-#    add_students1: "add students"
-#    view_edit: "view/edit"
-#    students_enrolled: "students enrolled"
-#    length: "Length:"
+    no_students: "Όχι μαθητές ακόμα!"
+    add_students1: "πρόσθεση μαθητών"
+    view_edit: "Παρακολούθηση/Επεξεργασία"
+    students_enrolled: "Εγγεγραμμένοι Μαθητές"
+    length: "Μήκος:"
 
   classes:
     archmage_title: "Αρχιμάγος"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     payments: "Πληρωμές"
     prepaid_codes: "Προπληρωμένοι Κώδικες"
     purchased: "Αγοράστηκαν"
-    sale: "Πώληση"
     subscription: "Συνδρομή"
     invoices: "Εντολές Πληρωμής"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     email_settings_url: "ρυθμίσεις σου για το ηλεκτρονικό ταχυδρομείο"
     email_description_suffix: "ή μέσα από συνδέσμους στα μυνήματα που σου στέλνουμε, μπορείς να αλλάξεις τις προτιμήσεις σου κα να απεγγραφείς εύκολα οποιαδήποτε στιγμή θέλεις."
     cost_title: "Κόστος"
-    cost_description: "Το παιχνίδι στο CodeCombat είναι δωρεάν για όλα τα βασικά του επίπεδα, με μια μηνιαία συνδρομή αξίας $9.99 Δολλάρια ΗΠΑ το μήνα για να έχετε πρόσβαση σε έξτρα επίπεδα and 3500 δώρο πετράδια κάθε μήνα. Μπορείτε να ακυρώσετε με ένα κλικ, και προσφέρουμε 100% εγγύηση επιστροφής χρημάτων."
+    cost_description: "Το παιχνίδι στο CodeCombat είναι δωρεάν για όλα τα βασικά του επίπεδα, με μια μηνιαία συνδρομή αξίας ${{price}} Δολλάρια ΗΠΑ το μήνα για να έχετε πρόσβαση σε έξτρα επίπεδα and {{gems}} δώρο πετράδια κάθε μήνα. Μπορείτε να ακυρώσετε με ένα κλικ, και προσφέρουμε 100% εγγύηση επιστροφής χρημάτων."
     copyrights_title: "Πνευματικά Δικαιώματα και Άδειες"
     contributor_title: "Συμφωνητικό Άδειας Συντελεστή (Contributor License Agreement)"
     contributor_description_prefix: "Όλες οι συνεισφορές, και στη σελίδα και στο GitHub υπόκεινται στη"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     nutshell_title: "Στα Γρήγορα"
     nutshell_description: "Όλες οι πηγές που παρέχουμε στο Διορθωτή Επιπέδων είναι ελεύθερα να τα χρησιμοποιήσετε όπως θέλετε για τη δημιουργία επιπέδων. Αλλά διατηρούμε το δικαίωμα να περιορίσουμε τη διανομή των ίδιων των επιπέδων (που δημιουργήθηκαν στο codecombat.com) ώστε να είναι επί πληρωμή στο μέλλον, αν αυτό καταλήξει να γίνει."
     canonical: "Η Αγγλική έκδοση αυτού του εγγράφου είναι η απόλυτη , ρυθμιστική (canonical) έκδοση. Αν υπάρχουν αισθητές διαφορές μεταξύ των μεταφράσεων, το Αγγλικό έγγραφο προηγείται."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Βραβεία Τουρνουά" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     license: "άδεια"
     oreilly: "ηλεκτρονικό βιβλίο της επιλογής σου"
 
-  account_profile:
-    settings: "Ρυθμίσεις" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Επεξεργασία προφίλ"
-    done_editing: "Τέλος επεξεργασίας"
-    profile_for_prefix: "Προφίλ για "
-    profile_for_suffix: ""
-    featured: "Προτεινόμενα"
-    not_featured: "Μη Προτεινόμενα"
-    looking_for: "Αναζήτηση για:"
-    last_updated: "Τελευταία ενημερώθηκε:"
-    contact: "Επικοινωνία"
-    active: "Επιθυμώ προσφορές για συνέντευξη"
-    inactive: "Δεν επιθυμώ προσφορές για συνέντευξη αυτή την περίοδο"
-    complete: "Ολοκληρωμένο"
-    next: "Επόμενο"
-    next_city: "πόλη;"
-    next_country: "επέλεξε τη χώρα σου."
-    next_name: "όνομα;"
-    next_short_description: "γράψε μία μικρή περιγραφή."
-    next_long_description: "περιέγραψε την επιθυμητή σου θέση."
-    next_skills: "κατόνομασε τουλάχιστον πέντε δεξιότητες."
-    next_work: "Γράψε το ιστορικό σου στην αγορά εργασίας."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index fb3f0aa83..100b6a2c0 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights and Licences"
     contributor_title: "Contributor Licence Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index 0521d9f76..36acdef83 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 51f5805ee..2b26d42b1 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -13,9 +13,6 @@
     multiplayer: "Multiplayer"  # Not currently shown on home page
     for_developers: "For Developers"  # Not currently shown on home page.
     or_ipad: "Or download for iPad"
-    hoc_class_code: "I Have a Class Code"
-    hoc_enter: "Enter"
-    hoc_title: "Hour of Code?"
 
   nav:
     play: "Levels"  # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@
     creating: "Creating Account..."
     sign_up: "Sign Up"
     log_in: "log in with password"
-    social_signup: "Or, you can sign up through Facebook or G+:"
     required: "You need to log in before you can go that way."
     login_switch: "Already have an account?"
     school_name: "School Name and City"
@@ -244,8 +240,6 @@
     incomplete: "Incomplete"
     timed_out: "Ran out of time"
     failing: "Failing"
-    action_timeline: "Action Timeline"
-    click_to_select: "Click on a unit to select it."
     control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Join Game"
     reload: "Reload"
@@ -438,30 +432,16 @@
     parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
     parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
     parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
     parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
     payment_methods: "Payment Methods"
     payment_methods_title: "Accepted Payment Methods"
-    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
     payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-    sale_already_subscribed: "You're already subscribed!"
-    sale_blurb1: "Save $21"
-    sale_blurb2: "off regular subscription price of $120 for a whole year!"
     sale_button: "Sale!"
     sale_button_title: "Save $21 when you purchase a 1 year subscription"
-    sale_click_here: "Click Here"
-    sale_ends: "Ends"
-    sale_extended: "*Existing subscriptions will be extended by 1 year."
-    sale_feature_here: "Here's what you'll get:"
-    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-    sale_continue: "Ready to continue adventuring?"
-    sale_limited_time: "Limited time offer!"
-    sale_new_heroes: "New heroes!"
-    sale_title: "Back to School Sale"
-    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Monthly Subscription"
-    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "You'll need a subscription to play this level."
     unlock_help_videos: "Subscribe to unlock all video tutorials."
 
@@ -473,21 +453,7 @@
     currently_free_until: "You currently have a subscription until"
     was_free_until: "You had a free subscription until"
     managed_subs: "Managed Subscriptions"
-    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-    group_discounts: "Group discounts"
-    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-    group_discounts_1st: "1st subscription"
-    group_discounts_full: "Full price"
-    group_discounts_2nd: "Subscriptions 2-11"
-    group_discounts_20: "20% off"
-    group_discounts_12th: "Subscriptions 12+"
-    group_discounts_40: "40% off"
     subscribing: "Subscribing..."
-    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-    subscribe_users: "Subscribe Users"
-    users_subscribed: "Users subscribed:"
-    no_users_subscribed: "No users subscribed, please double check your email addresses."
     current_recipients: "Current Recipients"
     unsubscribing: "Unsubscribing"
     subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -613,62 +579,17 @@
     carlos_blurb: "Celery Man"
     maka_title: "Customer Advocate"
     maka_blurb: "Storyteller"
+    robin_title: "UX Design & Research"
+    robin_blurb: "Scaffolding"
 
   teachers:
-    more_info: "More Info for Teachers"
-    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-    intro_2: "No experience required!"
-    free_title: "How much does it cost?"
-    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "There are 110+ FREE levels which cover every concept."
-    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-    free_3: "The CodeCombat content is divided into"
-    free_4: "courses"
-    free_5: ".  The first course is free, and about an hour of material."
-    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Teachers get a free trial!"
-    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Please fill out our"
-    teacher_subs_2: "Teacher Survey"
-    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "What is included in the subscription?"
-    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-    sub_includes_2: "80+ practice levels"
-    sub_includes_3: "Video tutorials"
-    sub_includes_4: "Premium email support"
-    sub_includes_5: "10 new heroes with unique skills to master"
-    sub_includes_6: "3500 bonus gems every month"
-    sub_includes_7: "Private Clans"
-    monitor_progress_title: "How do I monitor student progress?"
-    monitor_progress_1: "Student progress can be monitored by creating a"
-    monitor_progress_2: "for your class."
-    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-    monitor_progress_4: "page."
-    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-    private_clans_3: "."
     who_for_title: "Who is CodeCombat for?"
-    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-    material_title: "How much material is there?"
-    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-    concepts_title: "What concepts are covered?"
-    how_much_title: "How much does a monthly subscription cost?"
-    how_much_1: "A"
-    how_much_2: "monthly subscription"
-    how_much_3: "costs $9.99, and can be cancelled anytime."
-    how_much_4: "Additionally, we provide discounts for larger groups:"
-    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-    how_much_6: "for more details."
+    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
     more_info_title: "Where can I find more information?"
     more_info_1: "Our"
     more_info_2: "teachers forum"
     more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "System Requirements"
-    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
   teachers_survey:
     title: "Teacher Survey"
@@ -726,8 +647,6 @@
     screenshot_included: "Screenshot included."
     where_reply: "Where should we reply?"
     send: "Send Feedback"
-    contact_candidate: "Contact Candidate"  # Deprecated
-    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."  # Deprecated
 
   account_settings:
     title: "Account Settings"
@@ -772,11 +691,6 @@
     saved: "Changes Saved"
     password_mismatch: "Password does not match."
     password_repeat: "Please repeat your password."
-    job_profile: "Job Profile"  # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-    sample_profile: "See a sample profile"
-    view_profile: "View Your Profile"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Keyboard Shortcuts"
@@ -827,6 +741,7 @@
     subs_only: "subscribers only"
     create_clan: "Create New Clan"
     private_preview: "Preview"
+    private_clans: "Private Clans"
     public_clans: "Public Clans"
     my_clans: "My Clans"
     clan_name: "Clan Name"
@@ -1086,6 +1001,9 @@
     additional_resources_3_pref: "Visit our"
     additional_resources_3_mid: "Teacher Forums"
     additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+    additional_resources_4_pref: "Check out our"
+    additional_resources_4_mid: "Schools Page"
+    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
     your_classes: "Your Classes"
     no_classes: "No classes yet!"
     create_new_class1: "create new class"
@@ -1379,7 +1297,6 @@
     payments: "Payments"
     prepaid_codes: "Prepaid Codes"
     purchased: "Purchased"
-    sale: "Sale"
     subscription: "Subscription"
     invoices: "Invoices"
     service_apple: "Apple"
@@ -1569,7 +1486,7 @@
     email_settings_url: "your email settings"
     email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
     cost_title: "Cost"
-    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights and Licenses"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1604,6 +1521,8 @@
     nutshell_title: "In a Nutshell"
     nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
     canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+    third_party_title: "Third Party Services"
+    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Tournament Prizes"  # This section was for an old tournament and doesn't need new translations now.
@@ -1625,157 +1544,6 @@
     license: "license"
     oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "Settings"  # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Edit Profile"
-    done_editing: "Done Editing"
-    profile_for_prefix: "Profile for "
-    profile_for_suffix: ""
-    featured: "Featured"
-    not_featured: "Not Featured"
-    looking_for: "Looking for:"
-    last_updated: "Last updated:"
-    contact: "Contact"
-    active: "Looking for interview offers now"
-    inactive: "Not looking for offers right now"
-    complete: "complete"
-    next: "Next"
-    next_city: "city?"
-    next_country: "pick your country."
-    next_name: "name?"
-    next_short_description: "write a short description."
-    next_long_description: "describe your desired position."
-    next_skills: "list at least five skills."
-    next_work: "chronicle your work history."
-    next_education: "recount your educational ordeals."
-    next_projects: "show off up to three projects you've worked on."
-    next_links: "add any personal or social links."
-    next_photo: "add an optional professional photo."
-    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "Blog"
-    example_personal_site: "Personal Site"
-    links_header: "Personal Links"
-    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-    links_name: "Link Name"
-    links_name_help: "What are you linking to?"
-    links_link_blurb: "Link URL"
-    basics_header: "Update basic info"
-    basics_active: "Open to Offers"
-    basics_active_help: "Want interview offers right now?"
-    basics_job_title: "Desired Job Title"
-    basics_job_title_help: "What role are you looking for?"
-    basics_city: "City"
-    basics_city_help: "City you want to work in (or live in now)."
-    basics_country: "Country"
-    basics_country_help: "Country you want to work in (or live in now)."
-    basics_visa: "US Work Status"
-    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-    basics_looking_for: "Looking For"
-    basics_looking_for_full_time: "Full-time"
-    basics_looking_for_part_time: "Part-time"
-    basics_looking_for_remote: "Remote"
-    basics_looking_for_contracting: "Contracting"
-    basics_looking_for_internship: "Internship"
-    basics_looking_for_help: "What kind of developer position do you want?"
-    name_header: "Fill in your name"
-    name_anonymous: "Anonymous Developer"
-    name_help: "Name you want employers to see, like 'Nick Winter'."
-    short_description_header: "Write a short description of yourself"
-    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-    short_description: "Tagline"
-    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-    skills_header: "Skills"
-    skills_help: "Tag relevant developer skills in order of proficiency."
-    long_description_header: "Describe your desired position"
-    long_description_blurb: "Tell employers how awesome you are and what role you want."
-    long_description: "Self Description"
-    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Work Experience"
-    work_header: "Chronicle your work history"
-    work_years: "Years of Experience"
-    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-    work_blurb: "List your relevant work experience, most recent first."
-    work_employer: "Employer"
-    work_employer_help: "Name of your employer."
-    work_role: "Job Title"
-    work_role_help: "What was your job title or role?"
-    work_duration: "Duration"
-    work_duration_help: "When did you hold this gig?"
-    work_description: "Description"
-    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Education"
-    education_header: "Recount your academic ordeals"
-    education_blurb: "List your academic ordeals."
-    education_school: "School"
-    education_school_help: "Name of your school."
-    education_degree: "Degree"
-    education_degree_help: "What was your degree and field of study?"
-    education_duration: "Dates"
-    education_duration_help: "When?"
-    education_description: "Description"
-    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-    our_notes: "CodeCombat's Notes"
-    remarks: "Remarks"
-    projects: "Projects"
-    projects_header: "Add 3 projects"
-    projects_header_2: "Projects (Top 3)"
-    projects_blurb: "Highlight your projects to amaze employers."
-    project_name: "Project Name"
-    project_name_help: "What was the project called?"
-    project_description: "Description"
-    project_description_help: "Briefly describe the project."
-    project_picture: "Picture"
-    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-    project_link: "Link"
-    project_link_help: "Link to the project."
-    player_code: "Player Code"
-
-  employers:
-    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Hire developers, not credentials."  # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Get Started"
-    already_screened: "We've already technically screened all our candidates"
-    filter_further: ", but you can also filter further:"
-    filter_visa: "Visa"
-    filter_visa_yes: "US Authorized"
-    filter_visa_no: "Not Authorized"
-    filter_education_top: "Top School"
-    filter_education_other: "Other"
-    filter_role_web_developer: "Web Developer"
-    filter_role_software_developer: "Software Developer"
-    filter_role_mobile_developer: "Mobile Developer"
-    filter_experience: "Experience"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Recent Grad"
-    filter_experience_student: "College Student"
-    filter_results: "results"
-    start_hiring: "Start hiring."
-    reasons: "Three reasons you should hire through us:"
-    everyone_looking: "Everyone here is looking for their next opportunity."
-    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-    weeding: "Sit back; we've done the weeding for you."
-    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-    pass_screen: "They will pass your technical screen."
-    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-    make_hiring_easier: "Make my hiring easier, please."
-    what: "What is CodeCombat?"
-    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-    cost: "How much do we charge?"
-    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Name"
-    candidate_location: "Location"
-    candidate_looking_for: "Looking For"
-    candidate_role: "Role"
-    candidate_top_skills: "Top Skills"
-    candidate_years_experience: "Yrs Exp"
-    candidate_last_updated: "Last Updated"
-    candidate_who: "Who"
-    featured_developers: "Featured Developers"
-    other_developers: "Other Developers"
-    inactive_developers: "Inactive Developers"
-
   admin:
     av_espionage: "Espionage"  # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email or username"
@@ -1786,8 +1554,6 @@
     av_entities_sub_title: "Entities"
     av_entities_users_url: "Users"
     av_entities_active_instances_url: "Active Instances"
-    av_entities_employer_list_url: "Employer List"
-    av_entities_candidates_list_url: "Candidate List"
     av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Other"
     av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/eo.coffee b/app/locale/eo.coffee
index 6d6cb4715..6fcde6626 100644
--- a/app/locale/eo.coffee
+++ b/app/locale/eo.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Niveloj" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index 2cf775e3b..9a1236826 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     multiplayer: "Multijugador" # Not currently shown on home page
     for_developers: "Para Desarrolladores" # Not currently shown on home page.
     or_ipad: "O descargar para iPad"
-    hoc_class_code: "Tengo un Código de Clase"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Jugar" # The top nav bar entry where players choose which levels to play
@@ -51,7 +48,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     pitch_body: "Desarrollamos CodeCombat en inglés, pero ya tenemos jugadores de todo el mundo. Muchos de ellos quieren jugar en español pero no hablan inglés, así que si puedes hablar ambos, por favor considera registrarte pare ser un Diplomático y ayudar a traducir tanto el sitio de CodeCombat como todos los niveles al español."
     missing_translations: "Hasta que podamos traducir todo al español, verás inglés cuando el español no esté disponible."
     learn_more: "Aprende más sobre ser un Diplomático"
-    subscribe_as_diplomat: "Suscribete como un Diplomático"
+    subscribe_as_diplomat: "Suscríbete como un Diplomático"
 
   play:
     play_as: "Jugar Como " # Ladder page
@@ -92,7 +89,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
   share_progress_modal:
     blurb: "¡Estás haciendo un gran progreso! Cuéntale a tus padres cuánto has aprendido con CodeCombat."
     email_invalid: "Dirección de Email inválida."
-    form_blurb: "¡Ingresa su email debajo y les enseñaremos!"
+    form_blurb: "¡Escribe su email debajo y les enseñaremos!"
     form_label: "Dirección de Email"
     placeholder: "dirección de email"
     title: "Excelente Trabajo, Aprendiz"
@@ -115,10 +112,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     creating: "Creando Cuenta..."
     sign_up: "Registrarse"
     log_in: "Inicia sesión con tu contraseña"
-    social_signup: "O puedes conectarte a través de Facebook o G+:"
     required: "Necesitas entrar a tu cuenta antes de continuar."
     login_switch: "¿Ya tienes una cuenta?"
-#    school_name: "School Name and City"
+    school_name: "Nombre de Escuela y Ciudad"
     optional: "opcional"
 #    school_name_placeholder: "Example High School, Springfield, IL"
 
@@ -225,7 +221,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     years: "años"
 
   play_level:
-#    completed_level: "Completed Level:"
+    completed_level: "Nivel Completado:"
     course: "Curso:"
     done: "Listo"
     next_level: "Siguiente Nivel:"
@@ -242,12 +238,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     running: "Andando..."
     success: "¡Éxito!"
     incomplete: "Incompleto"
-    timed_out: "Se te acabo el tiempo"
+    timed_out: "Se te acabó el tiempo"
     failing: "Fallando"
-    action_timeline: "Cronología de Acción"
-    click_to_select: "Has click en una unidad para seleccionarla."
     control_bar_multiplayer: "Multijugador"
-    control_bar_join_game: "Ingresar al juego"
+    control_bar_join_game: "Entrar al juego"
     reload: "Recargar"
     reload_title: "¿Recargar Todo el Código?"
     reload_really: "¿Estás seguro de que quieres empezar este nivel desde el principio?"
@@ -292,13 +286,13 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     time_total: "Max:"
     time_goto: "Ir a:"
     non_user_code_problem_title: "No se puede cargar el nivel"
-    infinite_loop_title: "Loop infinito detectado"
+    infinite_loop_title: "Ciclo infinito detectado"
     infinite_loop_description: "El código inicial para construir el mundo no terminó de ejecutarse. Probablemente es muy lento o tiene un loop infinito. O puede ser un bug. Puedes tratar ejecutando este código nuevamente o reiniciar el código a su estado por defecto. Si eso no lo arregla, haznos saber."
     check_dev_console: "Tú puedes también abrir la consola de desarrollo para ver que puede salir mal."
     check_dev_console_link: "(instrucciones)"
     infinite_loop_try_again: "Intentar nuevamente"
     infinite_loop_reset_level: "Reiniciar Nivel"
-    infinite_loop_comment_out: "Comente Mi Código"
+    infinite_loop_comment_out: "Comenta Mi Código"
     tip_toggle_play: "Activa jugar/pausa con Ctrl+P."
     tip_scrub_shortcut: "Ctrl+[ y Ctrl+] para rebobinar y avanzar rápido."
     tip_guide_exists: "Haga click en la guía en la parte superior de la página para obtener información útil"
@@ -358,7 +352,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     guide_video_tutorial: "Guía en video"
     guide_tips: "Pistas"
     multiplayer_tab: "Multijugador"
-    auth_tab: "Ingresar"
+    auth_tab: "Entrar"
     inventory_caption: "Equipar a tu héroe"
     choose_hero_caption: "Elegir héroe, lenguaje"
     save_load_caption: "... y ver historia"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     parents_title: "Estimado Padre de Familia: Su hijo está aprendiendo a programar. ¿Le apoyaría a continuar?"
     parents_blurb1: "Con CodeCombat, su hijo aprenderá a escribiendo código real. Empezaran aprendiendo comandos simples avanzando a temas más complejos."
     parents_blurb1a: "La Programación es una habilidad escencial que su hijo sin duda usará en la adultez. Para el 2020, habilidades básicas en software serán requeridas por el 77% de trabajos, y los ingenieros de software están en alta demanda alrededor del mundo. ¿Sabía que Ciencias de la Computación es la carrera mejor pagada?"
-    parents_blurb2: "Por $9.99 USD mensuales, su hijo recibirá nuevos desafíos todas las semanas y soporte personal por email de programadores profesionales."
+    parents_blurb2: "Por ${{price}} USD mensuales, su hijo recibirá nuevos desafíos todas las semanas y soporte personal por email de programadores profesionales."
     parents_blurb3: "Sin Riesgo: Garantía de 100% de devolución, fácil 1-click y des- suscribirse."
     payment_methods: "Metodos de pago"
     payment_methods_title: "Metodos de pago aceptados."
     payment_methods_blurb1: "Actualmente aceptamos tarjetas de credito y Alipay." # {change}
     payment_methods_blurb2: "Si necesitas una forma alternativa de pago, por favor contactarse"
-    sale_already_subscribed: "¡Ya estás subscrito!"
-    sale_blurb1: "Ahorra $21" # {change}
-    sale_blurb2: "de descuento en el precio regular de una suscripción de $120 USD por un año completo!"
     sale_button: "Venta!"
-    sale_button_title: "Ahorra $21 al adquirir una suscripción por 1 año" # {change}
-    sale_click_here: "Haz Click Aquí"
-    sale_ends: "Termina"
-    sale_extended: "*Las suscripciones existentes se extenderán por un año."
-    sale_feature_here: "Esto es lo que obtendrás:"
-    sale_feature2: "¡Acceso a 9 poderosos <strong>nuevos héroes</strong> con habilidades únicas!"
-    sale_feature4: "¡Una bonificación inmediata de <strong>42,000 gemas</strong>!"
-    sale_continue: "¿Estás listo para continuar aventurándote?"
-    sale_limited_time: "¡Oferta por tiempo limitado!"
-    sale_new_heroes: "¡Nuevos héroes!"
-    sale_title: "Venta de regreso a clases"
-    sale_view_button: "Compra la suscripción de 1 año por"
+    sale_button_title: "Ahorra ${{discount}} al adquirir una suscripción por 1 año" # {change}
     stripe_description: "Suscripción Mensual"
-    stripe_description_year_sale: "Suscripción por 1 año ($21 descuento)" # {change}
+    stripe_description_year_sale: "Suscripción por 1 año (${{discount}} descuento)" # {change}
     subscription_required_to_play: "Necesitas una suscripción para jugar este nivel."
     unlock_help_videos: "Suscríbete para desbloquear todos los video tutoriales."
     personal_sub: "Suscripción Personal" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     currently_free_until: "Actualmente tienes una suscripción gratuita hasta"
     was_free_until: "Tuviste una suscripción gratuita hasta"
     managed_subs: "Suscripciones administradas"
-    managed_subs_desc: "Agregar suscripciones para otros jugadores (alumnos, hijos, etc.)"
-    managed_subs_desc_2: "Los recipientes deben tener una cuenta de CodeCombat asociada con el email que usted provea."
-    group_discounts: "Descuentos por grupo"
-    group_discounts_1: "También ofrecemos descuentos grupales por suscripciones masivas."
-    group_discounts_1st: "primera suscripción (incluye la tuya)"
-    group_discounts_full: "Precio regular"
-    group_discounts_2nd: "2-11 Suscripciones"
-    group_discounts_20: "20% descuento"
-    group_discounts_12th: "12+ Suscripciones"
-    group_discounts_40: "40% descuento"
     subscribing: "Suscribiendo..."
-    recipient_emails_placeholder: "Ingresa las direcciones de email a suscribir, una por línea."
-    subscribe_users: "Suscribir Usuarios"
-    users_subscribed: "Usuarios suscritos:"
-    no_users_subscribed: "No se suscribieron usuarios, por favor revisa las direcciones de email."
     current_recipients: "Recipientes actuales"
     unsubscribing: "Desuscribiendo..." # {change}
     subscribe_prepaid: "Click en suscribirse para utlizar un código prepago"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     josh_c_blurb: "Diseña juegos"
     carlos_title: "Manager de Región, Brasil"
     carlos_blurb: "Hombre apio"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Información para profesores"
-    intro_1: "CodeCombat es un juego online que enseña a programar.Los estudiantes escriben código en idiomas de programación real."
-    intro_2: "No se necesita experiencia previa!"
-    free_title: "¿Cuánto cuesta?"
-    cost_premium_server: "CodeCombat es gratis para lso primeros 5 niveles, después de ellos cuesta $9.99 USD mensuales para accesar a nuestros otros más de 190 niveles en nuestraos exclusivos servidores específicos para cada país."
-    free_1: "Hay más de 110 niveles gratis que cubren cada concepto."
-    free_2: "Una suscripción mensual le da acceso a tutoriales en vídeo y niveles extra para practicar."
-#    free_3: "The CodeCombat content is divided into"
-    free_4: "cursos"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "¡Los amestros obtienen suscripciones gratuitas!" # {change}
-    teacher_subs_0: "Ofrecemos suscripciones gratuitas a profesores con propósitos de evaluación." # {change}
-    teacher_subs_1: "Por favor llene nuestra"
-    teacher_subs_2: "Encuesta para maestros"
-    teacher_subs_3: "para configurar su suscripción." # {change}
-    sub_includes_title: "¿Qué se incluye en la suscripción?"
-    sub_includes_1: "Adicionalmente a los más de 70 niveles básicos, los estudiantes con una suscripción mensual obtienen acceso a estas características adicionales:" # {change}
-    sub_includes_2: "Más de 70 niveles de práctica" # {change}
-    sub_includes_3: "Video tutoriales"
-    sub_includes_4: "Soporte de correo electronico Premium"
-    sub_includes_5: "10 héroes nuevos con habilidades unicas que dominar"
-    sub_includes_6: "bonificación de 3500 gemas cada mes"
-    sub_includes_7: "Clanes privados"
-    monitor_progress_title: "¿Cómo monitoreo el progreso del estudiante?"
-    monitor_progress_1: "El progreso del estudiante puede ser monitoreado creando una"
-    monitor_progress_2: "para su clase."
-    monitor_progress_3: "Para agregar un estudiante, envíele el enlace de invitación para su Clan, que está en la"
-    monitor_progress_4: "página."
-    monitor_progress_5: "Después de que ellos se unan, podrá ver un resumen del progreso de los estudiantes en la página de su Clan."
-    private_clans_1: "Los Clanes privados proveen más privacidad y más detalle en la información de progreso de cada estudiante."
-    private_clans_2: "Para cerar un Clan privado, marque la caja 'Hacer clan privado' cuando esté creando un"
-    private_clans_3: "."
     who_for_title: "¿Para quienes es CodeCombat?"
-    who_for_1: "Recomendamos CodeCombat para estudiantes de edades 9 y arriba. No se require experiencia en programación."
-    who_for_2: "Hemos diseñado a CodeCombat para atraer a niños y niñas."
-    material_title: "Cuánto material hay?"
-    material_premium_server: "Aproximadamente 22 horas de juego repartidas en más de 120 niveles sólo para suscriptores, con cinco nueveos niveles cada semana." # {change}
-    material_1: "Aproximadamente 8 horas de contenido gratis y un adicional de 14 horas de contenido de suscriptores, con cinco nueveos niveles cada semana." # {change}
-    concepts_title: "¿Qué conceptos están cubiertos?"
-    how_much_title: "¿Cuánto cuesta una suscripción mensual?"
-    how_much_1: "una"
-    how_much_2: "suscribción mensual"
-    how_much_3: "Cuesta u$s9.99, y puede ser cancelada en cualquier momento."
-    how_much_4: "Adicionalmente, nosotros otorgamos descuentos a grupos grandes:"
-    how_much_5: "Aceptamos compras individuales con descuentos y suscripciones anuales para grupos, tales como una clase o una escuela. Por favor contacte"
-    how_much_6: "para más detalles."
+    who_for_1: "Recomendamos CodeCombat para estudiantes de edades 9 y arriba. No se require experiencia en programación." # {change}
+    who_for_2: "Hemos diseñado a CodeCombat para atraer a niños y niñas." # {change}
     more_info_title: "¿Dónde puedo encontrar más información?"
     more_info_1: "Nuestro"
     more_info_2: "el foro de profesores"
     more_info_3: "es un buen lugar para connectarse con los educadores que estan usando CodeCombat."
-    sys_requirements_title: "Requerimientos del sistema"
-    sys_requirements_1: "Un navegador moderno. Las últimas versiones de Chrome, Firefox o Safari. Internet Explorer 9 o más reciente."
-    sys_requirements_2: "CodeCombat no está soportado en iPad aún."
 
   teachers_survey:
     title: "Encuesta de Maestros"
@@ -676,14 +597,14 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     approved_1: "Su aplicación a una suscripción gratuita fue" # {change}
     approved_2: "aprobada." # {change}
 #    approved_4: "You can now enroll your students on the"
-#    approved_5: "courses"
+    approved_5: "cursos"
 #    approved_6: "page."
     denied_1: "Su aplicación a una suscripción gratuita ha sido" # {change}
     denied_2: "denegada."
     contact_1: "Por favor contactarse"
     contact_2: "si tiene más preguntas."
     description_1: "Ofrecemos suscripciones gratuitas a maestros con propósitos de evaluación. Puede hallar más información en nuestra"
-#    description_1b: "You can find more information on our"
+    description_1b: "Puede hallar más información en nuestra"
     description_2: "página"
     description_3: "de maestros."
     description_4: "Por favor llene esta encuesta rápida y le mandaremos por email las instrucciones de configuración."
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     screenshot_included: "Captura de pantalla incluida."
     where_reply: "¿A dónde deberíamos responder?"
     send: "Enviar Comentario"
-    contact_candidate: "Contacta un Candidato" # Deprecated
-    recruitment_reminder: "Usa este formulario para llegar a los candidatos que estés interesado en entrevistar. Recuerda que CodeCombat cobra 18% del primer año de salario. Este honorario se debe a la contratación del empleado y reembolsable por 90 días si el empleado no permanece contratado. Tiempo parcial, remoto, y empleados por contrato son gratis, como así también internos." # Deprecated
 
   account_settings:
     title: "Configuración de la Cuenta"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     saved: "Cambios Guardados"
     password_mismatch: "La contraseña no coincide."
     password_repeat: "Por favor repita su contraseña."
-    job_profile: "Perfil de Trabajo" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Tu perfil de trabajo ha sido aprobado por CodeCombat. Los empleadores podrán verlo hasta que lo marques como inactivo o permanezca sin cambios por cuatro semanas."
-    job_profile_explanation: "¡Hola! Llena esto, y te contactaremos acerca de encontrar un trabajo como desarrollador de software."
-    sample_profile: "Mira un perfil de ejemplo"
-    view_profile: "Ver tu perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Atajos de teclado"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     subs_only: "solo suscriptores"
     create_clan: "Crear nuevo clan"
     private_preview: "Vista previa"
+#    private_clans: "Private Clans"
     public_clans: "Clanes publicos"
     my_clans: "Mis Clanes"
     clan_name: "Nombre del clan"
@@ -855,7 +770,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     started_2: "Iniciado"
     not_started_2: "No inciiado"
     view_solution: "Click para ver la solución."
-#    view_attempt: "Click to view attempt."
+    view_attempt: "Click para ver intento."
     latest_achievement: "último logro"
     playtime: "Tiempo de juego"
     last_played: "Último jugado"
@@ -877,7 +792,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
   courses:
     course: "Curso"
     courses: "cursos"
-#    create_new_class: "Create New Class"
+    create_new_class: "Crear Nueva Clase"
     not_enrolled: "No estás inscrito en este curso."
     visit_pref: "Por favor visite la"
     visit_suf: "página para inscribirse."
@@ -953,7 +868,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     hours_content: "Horas de contenido:"
     get_free: "Obtenga curso GRATIS"
 #    enroll_paid: "Enroll Students in Paid Courses"
-#    you_have1: "You have"
+    you_have1: "Tiene"
 #    you_have2: "unused paid enrollments"
 #    use_one: "Use 1 paid enrollment for"
 #    use_multiple: "Use paid enrollments for the following students:"
@@ -963,9 +878,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    enroll_students: "Enroll Students"
 #    get_enrollments: "Get More Enrollments"
 #    change_language: "Change Course Language"
-#    keep_using: "Keep Using"
-#    switch_to: "Switch To"
-#    greetings: "Greetings!"
+    keep_using: "Seguir Usando"
+    switch_to: "Cambiar a"
+    greetings: "Saludos!"
     learn_p: "Aprender Python"
     learn_j: "Aprender JavaScript"
 #    language_cannot_change: "Language cannot be changed once students join a class."
@@ -974,48 +889,48 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    edit_details: "Edit class details"
 #    enrolled_courses: "enrolled in paid courses:"
 #    purchase_enrollments: "Purchase Enrollments"
-#    remove_student: "remove student"
-#    assign: "Assign"
+    remove_student: "Quitar alumno"
+    assign: "Asignar"
 #    to_assign: "to assign paid courses."
     teacher: "Maestro"
-#    complete: "Complete"
+    complete: "Completado"
 #    none: "None"
-#    save: "Save"
-#    play_campaign_title: "Play the Campaign"
-#    play_campaign_description: "You’re ready to take the next step! Explore hundreds of challenging levels, learn advanced programming skills, and compete in multiplayer arenas!"
-#    create_account_title: "Create an Account"
-#    create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!"
+    save: "Guardar"
+    play_campaign_title: "Jugar Campaña"
+    play_campaign_description: "Estas listo para dar el siguiente paso! Explora cientos de desafiantes niveles, aprende habilidades avanzadas de programación, y compite en arenas multijugador!"
+    create_account_title: "Crea una Cuenta"
+    create_account_description: "Registrate gratis con una cuenta CodeCombat y obten acceso a mas niveles, mas habilidades de programacion, y mas diversion!"
 #    preview_campaign_title: "Preview Campaign"
 #    preview_campaign_description: "Take a sneak peek at all that CodeCombat has to offer before signing up for your FREE account."
-#    arena: "Arena"
+    arena: "Arena"
 #    arena_soon_title: "Arena Coming Soon"
 #    arena_soon_description: "We are working on a multiplayer arena for classrooms at the end of"
-#    not_enrolled1: "Not enrolled"
+    not_enrolled1: "No inscrito"
 #    not_enrolled2: "Ask your teacher to enroll you in the next course."
 #    next_course: "Next Course"
-#    coming_soon1: "Coming soon"
-#    coming_soon2: "We are hard at work making more courses for you!"
-#    available_levels: "Available Levels"
-#    welcome_to_courses: "Adventurers, welcome to Courses!"
-#    ready_to_play: "Ready to play?"
-#    start_new_game: "Start New Game"
-#    play_now_learn_header: "Play now to learn"
-#    play_now_learn_1: "basic syntax to control your character"
+    coming_soon1: "Próximamente"
+    coming_soon2: "Estamos trabajando duro para hacer mas cursos para ti!"
+    available_levels: "Niveles Disponibles"
+    welcome_to_courses: "Aventureros, Bienvenidos a los Cursos!"
+    ready_to_play: "Estas listo?"
+    start_new_game: "Iniciar un Nuevo Juego"
+    play_now_learn_header: "Juega y Aprende"
+    play_now_learn_1: "Sintaxis básica para controlar a tu personaje"
 #    play_now_learn_2: "while loops to solve pesky puzzles"
-#    play_now_learn_3: "strings & variables to customize actions"
-#    play_now_learn_4: "how to defeat an ogre (important life skills!)"
+    play_now_learn_3: "cadenas & variables para personalizar acciones"
+    play_now_learn_4: "como vencer a un ogro (habilidades importantes en la vida!)"
 #    welcome_to_page: "Welcome to your Courses page!"
 #    completed_hoc: "Amazing! You've completed the Hour of Code course!"
-#    ready_for_more_header: "Ready for more? Play the campaign mode!"
-#    ready_for_more_1: "Use gems to unlock new items!"
+    ready_for_more_header: "Listo para mas? Juega el modo campaña!"
+    ready_for_more_1: "Usa las gemas para desbloquear nuevos objetos!"
 #    ready_for_more_2: "Play through brand new worlds and challenges"
 #    ready_for_more_3: "Learn even more programming!"
-#    saved_games: "Saved Games"
+    saved_games: "Juegos Guardados"
 #    hoc: "Hour of Code"
-#    my_classes: "My Classes"
+    my_classes: "Mis Clases"
 #    class_added: "Class successfully added!"
 #    view_class: "view class"
-#    view_levels: "view levels"
+    view_levels: "ver niveles"
 #    join_class: "Join A Class"
 #    ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:"
 #    enter_c_code: "<Enter Class Code>"
@@ -1023,7 +938,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    joining: "Joining class"
 #    course_complete: "Course Complete"
 #    play_arena: "Play Arena"
-#    start: "Start"
+    start: "Iniciar"
 #    last_level: "Last Level"
 #    welcome_to_hoc: "Adventurers, welcome to our Hour of Code!"
 #    logged_in_as: "Logged in as:"
@@ -1047,11 +962,11 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually."
 #    purchase_now: "Purchase Now"
 #    enrollments: "enrollments"
-#    remove_student1: "Remove Student"
+    remove_student1: "Quitar alumno"
 #    are_you_sure: "Are you sure you want to remove this student from this class?"
 #    remove_description1: "Student will lose access to this classroom and assigned classes. Progress and gameplay is NOT lost, and the student can be added back to the classroom at any time."
 #    remove_description2: "The activated paid license will not be returned."
-#    keep_student: "Keep Student"
+    keep_student: "Mantener alumno"
 #    removing_user: "Removing user"
 #    to_join_ask: "To join a class, ask your teacher for an unlock code."
 #    join_this_class: "Join Class"
@@ -1062,13 +977,13 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    classroom: "Classroom"
 #    use_school_email: "use your school email if you have one"
 #    unique_name: "a unique name no one has chosen"
-#    pick_something: "pick something you can remember"
+    pick_something: "Escoge algo que recuerdes"
 #    class_code: "Class Code"
 #    optional_ask: "optional - ask your teacher to give you one!"
-#    optional_school: "optional - what school do you go to?"
-#    start_playing: "Start Playing"
-#    skip_this: "Skip this, I'll create an account later!"
-#    welcome: "Welcome"
+    optional_school: "opcional - a qué escuela vas?"
+    start_playing: "Comienza a Jugar"
+    skip_this: "Saltar esto, Crearé una cuenta mas tarde!"
+    welcome: "Bienvenido"
 #    getting_started: "Getting Started with Courses"
 #    download_getting_started: "Download Getting Started Guide [PDF]"
 #    getting_started_1: "Create a new class by clicking the green 'Create New Class' button below."
@@ -1079,20 +994,23 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
-#    available_courses: "Available Courses"
+    available_courses: "Cursos Disponibles"
 #    unused_enrollments: "Unused enrollments available:"
 #    students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses."
 #    active_courses: "active courses"
-#    no_students: "No students yet!"
-#    add_students1: "add students"
-    view_edit: "vee/editar"
+    no_students: "Aún no hay alumnos!"
+    add_students1: "añadir alumnos"
+    view_edit: "ver/editar"
 #    students_enrolled: "students enrolled"
 #    length: "Length:"
 
@@ -1280,7 +1198,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     helpful_ambassadors: "Nuestros amables Embajadores:"
 
   ladder:
-    please_login: "Por favor inicia sesión antes de jugar una partida de escalera."
+    please_login: "Por favor inicia sesión antes de jugar una partida de clasificación."
     my_matches: "Mis Partidas"
     simulate: "Simular"
     simulation_explanation: "¡Simulando tus juegos puedes mejorar tu posición más rápido!"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     payments: "Pagos"
     prepaid_codes: "Códigos Prepagados"
     purchased: "Comprado"
-    sale: "Venta"
     subscription: "Suscripción"
     invoices: "Facturas"
     service_apple: "Apple"
@@ -1495,11 +1412,11 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     courses: "Cursos"
 #    course_instance: "Course Instance"
 #    course_instances: "Course Instances"
-#    classroom: "Classroom"
-#    classrooms: "Classrooms"
+    classroom: "Salón"
+    classrooms: "Salones"
     clan: "Clan"
     clans: "Clanes"
-#    members: "Members"
+    members: "Miembros"
     users: "Usuarios"
 
   concepts:
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     email_settings_url: "tus opciones de mail"
     email_description_suffix: "o mediante links en los mails que mandamos, tu puedas cambiar tus preferencias y fácilmente desuscribirte en cualquier momento."
     cost_title: "Costo"
-    cost_description: "CodeCombat es gratuito para todos sus niveles principales, con una suscripción de $9.99 USD/mes con acceso a niveles adicionales y un bonus de 3500 gemas cada mes. Puedes cancelar con un click y ofrecemos una garantía del 100%."
+    cost_description: "CodeCombat es gratuito para todos sus niveles principales, con una suscripción de ${{price}} USD/mes con acceso a niveles adicionales y un bonus de {{gems}} gemas cada mes. Puedes cancelar con un click y ofrecemos una garantía del 100%."
     copyrights_title: "Derechos y Licencias"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Todas las Contribuciones, tanto en el website como en nuestro Repositorio GitHub, estan sujetos a nuestra aprobación."
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     nutshell_title: "En una palabra"
     nutshell_description: "Cualquier recurso que te proveamos en el Editor de Niveles es gratis de usar como te plazca para la creación de Niveles. Sin embargo, nos reservamos el derecho de restringir la distribución de los niveles por sí mismos (aquellos creados en codecombat.com) para así poder cobrar por ellos en el futuro, si es que eso es lo que termina pasando."
     canonical: "La versión en inglés de este documento es la versión canónica y definitiva. Si hay alguna discrepancia entre las traducciones, la versión en inglés toma precedencia."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premios de Torneos" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     license: "licencia"
     oreilly: "ebook de su elección"
 
-  account_profile:
-    settings: "Configuración" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Editar Perfil"
-    done_editing: "Terminar Edición"
-    profile_for_prefix: "Perfil para "
-    profile_for_suffix: ""
-    featured: "Soportado"
-    not_featured: "No Soportado"
-    looking_for: "Buscando:"
-    last_updated: "Última Actualización:"
-    contact: "Contacto"
-    active: "En busca de entrevistas ahora mismo"
-    inactive: "No busco entrevistas por ahora"
-    complete: "completado"
-    next: "Siguiente"
-    next_city: "¿Ciudad?"
-    next_country: "selecciona tu país"
-    next_name: "¿Nombre?"
-    next_short_description: "escribe una breve descripción."
-    next_long_description: "describe a que posción aspiras."
-    next_skills: "nombra al menos cinco de tus cualidades."
-    next_work: "detalla tu historial laboral."
-    next_education: "realiza un recuento de tus méritos academicos."
-    next_projects: "exhibe un máximo de tres proyectos en los que hayas participado."
-    next_links: "añade cualquier enlace personal o social"
-    next_photo: "añade una foto profesional (opcional)."
-    next_active: "etiquetate como abierto a ofertas, para aparecer en las busquedas."
-    example_blog: "Blog"
-    example_personal_site: "Sitio Personal"
-    links_header: "Enlaces Personale"
-    links_blurb: "Añade enlaces a cualquier otro sitio o perfil que desees destacar, como tu GitHub, LinkedIn, o blog."
-    links_name: "Nombre del enlace"
-    links_name_help: "¿A que estas enlazando?"
-    links_link_blurb: "URL del enlace"
-    basics_header: "Actualizar información básica"
-    basics_active: "Abierto a ofertas"
-    basics_active_help: "¿Quieres ofertas para entrevistarte ahora mismo?"
-    basics_job_title: "Posición Laboral deseada"
-    basics_job_title_help: "¿Qué posición laboral estas buscando?"
-    basics_city: "Ciudad"
-    basics_city_help: "Ciudad en la que deseas trabajar (o en la que vives ahora)."
-    basics_country: "País"
-    basics_country_help: "País en el que deseas trabajar (o en el que vives ahora)."
-    basics_visa: "Estatus laboral en EEUU"
-    basics_visa_help: "¿Te encuentras autorizado para trabajar en los EEUU, o necesitas un patrocinador de visa? (Si vives en Canada o australia,  selecciona autorizado.)"
-    basics_looking_for: "Buscando"
-    basics_looking_for_full_time: "Tiempo completo"
-    basics_looking_for_part_time: "Tiempo parcial"
-    basics_looking_for_remote: "A distacia"
-    basics_looking_for_contracting: "Contratación"
-    basics_looking_for_internship: "Pasantía"
-    basics_looking_for_help: "¿Qué tipo de posición estas buscando como desarrollador?"
-    name_header: "Escribe tu nombre"
-    name_anonymous: "Desarrollador anónimo"
-    name_help: "El nombre que los empleadores verán, por ejemplo 'Max Power'."
-    short_description_header: "Descríbete en pocas palabras"
-    short_description_blurb: "Añade un lema, para que un empleador pueda conocerte mejor facilmente."
-    short_description: "Lema"
-    short_description_help: "¿Quién eres, y que estas buscando? 140 caractéres máximo."
-    skills_header: "Cualidades"
-    skills_help: "Etiqueta tus cualidades más relevantes como desarrollador, en orden de competencia."
-    long_description_header: "Describe tu posición laboral deseada"
-    long_description_blurb: "Dile a los empleadores lo genial que eres, y que rol estas buscando."
-    long_description: "Auto Descripción"
-    long_description_help: "Describete a ti mismo para tus potenciales empleadores. Mantenlo corto y ve al grano. Te recomendamos destacar la posición laboral de mayor interes para ti. Un enfoque reduccionista, de buen gusto, es bienvenido; 600 caracteres mmáximo."
-    work_experience: "Experiencia de Trabajo"
-    work_header: "Detalla tu historial laboral"
-    work_years: "Años de Experiencia"
-    work_years_help: "Cuántos años de experiencia profesional (pagos) desarrollando software tienes?"
-    work_blurb: "Realiza una lista con lo que consideres es tu experiencia laboral relevante, comenzando por la más reciente."
-    work_employer: "Empleador"
-    work_employer_help: "Nombre de tu empleador."
-    work_role: "Nombre de la posición laboral"
-    work_role_help: "¿Cuál era tu posición laboral o rol?"
-    work_duration: "Duración"
-    work_duration_help: "¿Cuál fue la duración de esa experiencia?"
-    work_description: "Descripción"
-    work_description_help: "¿Qué actividades realizabas allí? (140 caracteres; opcional)"
-    education: "Educación"
-    education_header: "Realiza un recuento de tus méritos academicos"
-    education_blurb: "Escribe un recuento de tus méritos academicos."
-    education_school: "Escuela"
-    education_school_help: "Nombre de tu escuela."
-    education_degree: "Título"
-    education_degree_help: "¿Cuál fue tu título y área de estudio"
-    education_duration: "Fechas"
-    education_duration_help: "¿Cuándo?"
-    education_description: "Descripción"
-    education_description_help: "Destaca cualquier cosa acerca de esta experiencia educacional. (140 caracteres; opcional)"
-    our_notes: "Nuestras Notas"
-    remarks: "Observaciones"
-    projects: "Proyectos"
-    projects_header: "Añade 3 proyectos"
-    projects_header_2: "Proyectos (Top 3)"
-    projects_blurb: "Destaca tus proyectos para sorprender a los empleadores."
-    project_name: "Nombre del Proyecto"
-    project_name_help: "¿Cómo se llamaba el proyecto?"
-    project_description: "Descripción"
-    project_description_help: "Describe el proyecto brevemente.."
-    project_picture: "Foto"
-    project_picture_help: "Sube una imagen de 230x115px (o mayor) mostrando el proyecto"
-    project_link: "Enlace"
-    project_link_help: "Enlace al proyecto."
-    player_code: "Código de Jugador"
-
-  employers:
-    deprecation_warning_title: "Lo sentimos, CodeCombat no esta reclutando en estos momentos."
-    deprecation_warning: "Estamos enfocados en los niveles de principiante en lugar de buscar desarrolladores expertos por el momento."
-    hire_developers_not_credentials: "Contrata desarrolladores, no credenciales." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Comenzar"
-    already_screened: "Ya hemos realizado un monitoreo técnico de todos los candidatos"
-    filter_further: ",pero también puedes hacer un filtrado mas específico:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizado para los EEUU"
-    filter_visa_no: "No autorizado"
-    filter_education_top: "Escuela de elite"
-    filter_education_other: "Otro"
-    filter_role_web_developer: "Desarrollador Web"
-    filter_role_software_developer: "Desarrollador de Software"
-    filter_role_mobile_developer: "Desarrollador Móvil"
-    filter_experience: "Experiencia"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Grado académico reciente"
-    filter_experience_student: "Estudiante Universitario"
-    filter_results: "resultados"
-    start_hiring: "Comenzar a contratar."
-    reasons: "Tres razones por las cuales deberías contratar a traves de nosotros:"
-    everyone_looking: "Todos aquí estan en busqueda de una oportunidad laboral."
-    everyone_looking_blurb: "Olvidate del 20% de respuestas promedio obtenidas via LinkedIn InMail. Todas las personas listadas en este sitio quieren encontrar su próxima posición laboral y responderan a tu solicitud para concretar una introducción."
-    weeding: "Relajate; ya hemos desmalezado por ti."
-    weeding_blurb: "Todo jugador listado ha sido monitoreado en lo que a su habilidad técnica se refiere. También llevamos a cabo monitoreos telefónicos a los candidatos seleccionados y dejamos notas en sus perfiles para ahorrarte tiempo."
-    pass_screen: "Ell@s superaran tu monitoreo técnico."
-    pass_screen_blurb: "Revisa el código de cada jugador antes de ponerte en contacto. Uno de nuestros empleadores se encontro con una proporción 5 veces mayor de nuestros desarrolladores superando su monitoreo técnico al compararlo con contrataciones realizadas en Hacker News."
-    make_hiring_easier: "Has mi contratación mas simple, por favor."
-    what: "Que es CodeCombat?"
-    what_blurb: "CodeCombat es un juego multijugador de programación para navegadores. Los jugadores escriben un código para medirse en batalla contra otros desarrolladores. Nuestros jugadores cuentan con experiencia en los principales lenguajes técnicos."
-    cost: "¿Cuánto cobramos?"
-    cost_blurb: "Cobramos un 15% del primer salario anual y ofrecemos una garantía de devolución del 100% del dinero por 90 días. No cobramos por candidatos que actualmente se encuentren siendo entrevistados de forma activa por tu compañía."
-    candidate_name: "Nombre"
-    candidate_location: "Ubicación"
-    candidate_looking_for: "Buscando"
-    candidate_role: "Rol"
-    candidate_top_skills: "Mejores Habilidades"
-    candidate_years_experience: "Años de Exp"
-    candidate_last_updated: "Última Actualización"
-    candidate_who: "Quién"
-    featured_developers: "Desarrolladores Destacados"
-    other_developers: "Otros Desarrolladores"
-    inactive_developers: "Desarrolladores Inactivos"
-
   admin:
     av_espionage: "Espionaje" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Mail o usuario"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Usuarios"
     av_entities_active_instances_url: "Instancias Activas"
-    av_entities_employer_list_url: "Lista de Empleadores"
-    av_entities_candidates_list_url: "Lista de Candidatos"
     av_entities_user_code_problems_list_url: "Lista de Usuarios con problemas de código"
     av_other_sub_title: "Otro"
     av_other_debug_base_url: "Base (para depurar base.jade)"
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index bc4cd0028..4354cef5b 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     multiplayer: "Multijugador" # Not currently shown on home page
     for_developers: "Para programadores" # Not currently shown on home page.
     or_ipad: "O descargalo para iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Jugar" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     creating: "Creando cuenta..."
     sign_up: "Registrarse"
     log_in: "Iniciar sesión con contraseña"
-    social_signup: "O, puedes acceder a través de tu cuenta de Facebook o G+:"
     required: "Tienes que estar reginstrado antes de poder seguir por aquí."
     login_switch: "¿Ya tienes una cuenta?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     incomplete: "Incompleto"
     timed_out: "Te has quedado sin tiempo"
     failing: "Fallando"
-    action_timeline: "Cronología de Acción"
-    click_to_select: "Click en una unidad para seleccionarla"
     control_bar_multiplayer: "Multijugador"
     control_bar_join_game: "Unirse a un juego"
     reload: "Recargar"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     parents_title: "Queridos padres: Vuestro hijo está aprendiendo a programar. ¿Le ayudáis para que continue?"
     parents_blurb1: "Su hijo ha jugado __nLevels__ niveles y ha aprendido conceptos básicos de programación. Ayudadle a mejorar su eficiencia adquiriendo una suscripción para poder seguir programando."
     parents_blurb1a: "La programación informática es una habilidad fundamental que su hijo usará indudablemente cuando sea un adulto. Aproximadamente en 2020, se necesitarán conceptos de programación en el 77% de los empleos, y los ingenieros programadores están muy demandados en todo el mundo. ¿Sabían que la Ingeniería Informática es la titulación que más dinero paga?"
-    parents_blurb2: "Por tan sólo $9.99 USD/mes, su hijo podrá afrontar nuevos retos cada semana, y recibirá soporte por correo electrónico de programadores profesionales."
+    parents_blurb2: "Por tan sólo ${{price}} USD/mes, su hijo podrá afrontar nuevos retos cada semana, y recibirá soporte por correo electrónico de programadores profesionales."
     parents_blurb3: "Sin riesgo: 100% garantía de devoluación de dinero, desuscripción con un simple click."
     payment_methods: "Métodos de pago"
     payment_methods_title: "Métodos de pago permitidos"
     payment_methods_blurb1: "Actualmente aceptamos pagos a través de tarjetas de crédito / débito y Alipay." # {change}
     payment_methods_blurb2: "Si necesitas una forma alternativa de pago, puedes contactarnos"
-    sale_already_subscribed: "Ya estás suscrito!"
-    sale_blurb1: "¡Ahorra un $21" # {change}
-    sale_blurb2: "de una suscripción normal de 120$ por un año entero!!"
     sale_button: "Comprar!"
-    sale_button_title: "Ahorra un $21 si compras una suscripción de 1 año" # {change}
-    sale_click_here: "Haz click aquí"
-    sale_ends: "Finaliza"
-    sale_extended: "*Las suscripciones actuales se extenderán un año más."
-    sale_feature_here: "Esto es lo que tendrás:"
-    sale_feature2: "¡10 <strong>héroes nuevos</strong> con poderes únicos!"
-    sale_feature4: "¡<strong>42,000 gemas extra</strong> entregadas al momento!"
-    sale_continue: "¿Listo para continuar con la aventura?"
-    sale_limited_time: "¡Oferta de tiempo limitado!"
-    sale_new_heroes: "¡Nuevos héroes!"
-    sale_title: "Venta de Vuelta al Colegio"
-    sale_view_button: "Compra una suscripción de 1 año por"
+    sale_button_title: "Ahorra un ${{discount}} si compras una suscripción de 1 año" # {change}
     stripe_description: "Suscripción mensual"
-    stripe_description_year_sale: "Suscripción de 1 año ($21 descuento)" # {change}
+    stripe_description_year_sale: "Suscripción de 1 año (${{discount}} descuento)" # {change}
     subscription_required_to_play: "Necesitas una suscripción para jugar este nivel."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     currently_free_until: "Actualmente tienes una suscripción hasta el"
     was_free_until: "Tenías una suscripción gratuita hasta el"
     managed_subs: "Suscripciones administradas"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
     subscribing: "Suscribiendo..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
     current_recipients: "Últimos recibos"
     unsubscribing: "Dando de baja..." # {change}
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-    more_info: "Información para profesores"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-    intro_2: "¡No se necesita experiencia!"
-    free_title: "¿Cuanto cuesta?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-    how_much_1: "Una"
-    how_much_2: "suscripción mensual"
-    how_much_3: "tiene un coste de $9.99, y puede ser cancelada en cualquier momento."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     screenshot_included: "Pantallazo incluido."
     where_reply: "¿Dónde debemos responder?"
     send: "Envía tu comentario"
-    contact_candidate: "Contactar Candidato" # Deprecated
-    recruitment_reminder: "Usa este formulario para contactar con los candidatos que quieras entrevistar. Recuerda que CodeCombat cobrará el 18% del salario durante el primer año. La cuota es por la contratación del empleado y es reembolsable durante 90 días si el empleado no permanece contratado. A tiempo parcial, a distancia y los empleados de contrato son gratis, como lo son los becarios." # Deprecated
 
   account_settings:
     title: "Ajustes de la cuenta"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     saved: "Cambios guardados"
     password_mismatch: "La contraseña no coincide"
     password_repeat: "Repite tu contraseña."
-    job_profile: "Perfil de trabajo" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Tu perfil de trabajo ha sido aprobado por CodeCombat. Los empleadores podrán verlo hasta que lo marques como inactivo o no haya sido cambiado durante cuatro semanas."
-    job_profile_explanation: "¡Hola! Rellena esto y estaremos en contacto para hablar sobre encontrarte un trabajo como desarrollador de software."
-    sample_profile: "Mira un perfil de ejemplo"
-    view_profile: "Mira tu perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Atajos de teclado"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     subs_only: "Sólo para usuarios suscritos"
     create_clan: "Crear nuevo Clan"
     private_preview: "Previsualización"
+#    private_clans: "Private Clans"
     public_clans: "Clanes públicos"
     my_clans: "Mis Clanes"
     clan_name: "Nombre del Clan"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     payments: "Pagos"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Adquirido"
-    sale: "Venta"
     subscription: "Suscripción"
     invoices: "Facturas"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     email_settings_url: "tus ajustes de correo electrónico"
     email_description_suffix: "o a través de los enlaces en los correos que te enviemos, puedes cambiar tus preferencias y darte de baja fácilmente en cualquier momento."
     cost_title: "Precio"
-    cost_description: "Actualmente, ¡CodeCombat es 100% gratis! Uno de nuestros principales objetivos es mantenerlo así, de forma que el mayor número posible de gente pueda jugar, independientemente de sus posibilidades económicas. Si las cosas se tuercen, quizás tengamos que cobrar suscripciones o por algún contenido, pero preferimos no hacerlo. Con un poco de suerte, podremos mantener la empresa con: "
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights y Licencias"
     contributor_title: "Acuerdo de Licencia del Colaborador"
     contributor_description_prefix: "Todas las colaboraciones, tanto en la web como en nuestro repositorio de GitHub, están sujetas a nuestro"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     nutshell_title: "En una palabra"
     nutshell_description: "Todos los recursos que ofrecemos en el editor de niveles son libres de ser utilizados para crear niveles. Pero nos reservamos el derecho de restringir la distribución de los propios niveles (que se crean en codecombat.com) de modo que se pueda cobrar por ellos en el futuro, si eso es lo que termina sucediendo."
     canonical: "La versión inglesa de este documento es la canónica, la definitiva. Si hay alguna diferencia con lo que pueda aparecer en las traducciones, la versión inglesa es la que prevalece sobre las demás."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premios del Torneo" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     license: "licencia"
     oreilly: "ebook de tu eleccion"
 
-  account_profile:
-    settings: "Configuración" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Editar Perfil"
-    done_editing: "Edición Terminada"
-    profile_for_prefix: "Perfil de "
-    profile_for_suffix: ""
-    featured: "Destacado"
-    not_featured: "Sin Destacar"
-    looking_for: "Buscando:"
-    last_updated: "Última actualización:"
-    contact: "Contacto"
-    active: "Buscando entrevistas de trabajo"
-    inactive: "No busco entrevistas de trabajo ahora mismo"
-    complete: "completado"
-    next: "Siguiente"
-    next_city: "¿Ciudad?"
-    next_country: "elige tu país."
-    next_name: "¿Nombre?"
-    next_short_description: "escribe una descripción breve."
-    next_long_description: "describe tu puesto de trabajo deseado."
-    next_skills: "Pon al menos cinco habilidades."
-    next_work: "Resume tu historia laboral."
-    next_education: "Relatar tu experiencia educativa."
-    next_projects: "Muestranos tres proyectos en los que hayas trabajado."
-    next_links: "añade links personales o de redes sociales."
-    next_photo: "añadir una foto para el perfil profesional."
-    next_active: "mostrarte abierto a ofertas en las busquedas."
-    example_blog: "Blog"
-    example_personal_site: "Web personal"
-    links_header: "Enlaces Personales"
-    links_blurb: "Enlaza otros sitios o perfiles que quieras destacar como tu GitHub, LinkedIn, o tu blog."
-    links_name: "Nombre del enlace"
-    links_name_help: "¿Qué estás enlazando?"
-    links_link_blurb: "URL del enlace"
-    basics_header: "Actualizar información básica"
-    basics_active: "Abierto a ofertas"
-    basics_active_help: "Buscas entrevistas de trabajo ahora?"
-    basics_job_title: "Nombre del Cargo deseado"
-    basics_job_title_help: "Que tipo de rol estas buscando?"
-    basics_city: "Ciudad"
-    basics_city_help: "Ciudad en la que quieres trabajar (o en la que vives actualmente)."
-    basics_country: "País"
-    basics_country_help: "País en la que quieres trabajar (o en la que vives actualmente)."
-    basics_visa: "Estatus de Trabajo en EEUU"
-    basics_visa_help: "Estas autorizado a trabajar en EEUU, o necesitas una visa patrocinada? (Si vives en Canada o Australia, marca autorizado.)"
-    basics_looking_for: "Estoy Buscando"
-    basics_looking_for_full_time: "Full-time (tiempo completo)"
-    basics_looking_for_part_time: "Tiempo Partido"
-    basics_looking_for_remote: "Desde Casa"
-    basics_looking_for_contracting: "Contractual"
-    basics_looking_for_internship: "Interino"
-    basics_looking_for_help: "Que tipo de puesto de desarrollo te gustaria?"
-    name_header: "Escriba su nombre"
-    name_anonymous: "Desarrollador Anónimo"
-    name_help: "Esto es lo que quieres que vean las empresas, algo como 'Nick Winter'."
-    short_description_header: "Escriba una breve descripción sobre usted."
-    short_description_blurb: "Añade una frase que ayude a las empresas a hacerse una idea de ti."
-#    short_description: "Tagline"
-    short_description_help: "¿Quién eres, y qué estás buscando? 140 caracteres como máximo."
-    skills_header: "Habilidades"
-    skills_help: "Etiqueta tus habilidades de desarrolloen orden de competencia."
-    long_description_header: "Describenos tu trabajo soñado"
-    long_description_blurb: "Cuenta a tus empleadores lo impresionante que eres y que trabajo estas buscando."
-    long_description: "Descripción Personal"
-    long_description_help: "Descríbete a ti mismo para tus potenciales empleadores. Mantenlo corto y directo. Recomendamos describir la posición que más te interesa. 600 caracteres max."
-    work_experience: "Experiencia laboral"
-    work_header: "Cuentanos un poco de tu historial laboral"
-    work_years: "Años de experiencia"
-    work_years_help: "Cuantos años de experiencia profesional(remunerada) como desarrollador de sofware tienes?"
-    work_blurb: "Haz un listado con la experiencia laboral relevante, los mas recientes primero."
-    work_employer: "Empresa/Empleador"
-    work_employer_help: "Nombre de la empresa /el empleador."
-    work_role: "Cargo"
-    work_role_help: "¿Cuál era tu cargo o rol?"
-    work_duration: "Duración"
-#    work_duration_help: "When did you hold this gig?"
-    work_description: "Descripción"
-    work_description_help: "Que has hecho alli? (140 caracteres maximo; opcional)"
-    education: "Educación"
-    education_header: "Detalla tu experiencia académica"
-    education_blurb: "Lista tu experiencia académica."
-    education_school: "Universidad"
-    education_school_help: "Nombre de la Universidad."
-    education_degree: "Titulo"
-    education_degree_help: "Cual era tu carrera y tu campo de estudio?"
-    education_duration: "Duracion"
-    education_duration_help: "¿Cuándo?"
-    education_description: "Descripción"
-    education_description_help: "Resalta algo de tu experiencia educacional. (140 caracteres maximo; optional)"
-    our_notes: "Nuestras notas"
-    remarks: "Observaciones"
-    projects: "Proyectos"
-    projects_header: "Añade 3 proyectos"
-    projects_header_2: "Proyectos (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-    project_name: "Nombre del proyecto"
-    project_name_help: "Como se llamaba el proyecto?"
-    project_description: "Descripción"
-    project_description_help: "Describe el proyecto brevemente."
-    project_picture: "Foto"
-    project_picture_help: "Sube una imagen de 230x115px o mas grande enseñandonos el proyecto."
-    project_link: "Enlace"
-    project_link_help: "Enlace al proyecto."
-    player_code: "Codigo de Jugador"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Contrata desarrolladores, no credenciales." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Empezar"
-#    already_screened: "We've already technically screened all our candidates"
-    filter_further: ", Pero puedes filtrar mas alla:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizado en EEUU"
-    filter_visa_no: "No Autorizado"
-#    filter_education_top: "Top School"
-    filter_education_other: "Otros"
-    filter_role_web_developer: "Desarrollador Web"
-    filter_role_software_developer: "Desarrollador de Software"
-    filter_role_mobile_developer: "Desarrollador de Mobiles"
-    filter_experience: "Experiencia"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Recien Graduado"
-    filter_experience_student: "Estudiante Universitario"
-    filter_results: "notas"
-    start_hiring: "Comenzar a contratar."
-    reasons: "Tres razones por las que deberias contratar a traves de nosotros:"
-    everyone_looking: "Todo el mundo aqui esta buscando su proxima oportunidad."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-    weeding: "Sientate; nosotros hemos hecho el trabajo por ti."
-    weeding_blurb: "Todos los jugadores que ponemos en la lista ha sido seguido por sus habilidades tecnicas. Tambien hacemos llamadas de telefono para los candidatos seleccionados y haz notas en sus perfiles para ahorrar tiempo."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-    make_hiring_easier: "Hacer mi contratacion mas facil, por favor."
-    what: "¿Qué es CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-    cost: "Cuanto cobramos?"
-    cost_blurb: "Cobramos el 15% del salario del primer año y ofrecemos reembolso del 100% del dinero durante 90 dias. No cobramos a los candidatos que ya estan siendo entrevistados en tu compañia."
-    candidate_name: "Nombre"
-    candidate_location: "Ubicación"
-    candidate_looking_for: "Buscando"
-    candidate_role: "Rol"
-    candidate_top_skills: "Mejores Habilidades"
-    candidate_years_experience: "Años Exp"
-    candidate_last_updated: "Última actualización"
-    candidate_who: "Quien"
-    featured_developers: "Desarrolladores Destacados"
-    other_developers: "Otros Desarrolladores"
-    inactive_developers: "Desarrolladores Inactivos"
-
   admin:
     av_espionage: "Espionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email o Nombre de usuario"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Usuarios"
     av_entities_active_instances_url: "Instancias Activas"
-    av_entities_employer_list_url: "Lista de empleados"
-    av_entities_candidates_list_url: "Lista de Candidatos"
     av_entities_user_code_problems_list_url: "Lista de Problemas de Codigo del Usuario"
     av_other_sub_title: "Otros"
     av_other_debug_base_url: "Base (para debugging base.jade)"
diff --git a/app/locale/et.coffee b/app/locale/et.coffee
index ad93ff240..88de4f113 100644
--- a/app/locale/et.coffee
+++ b/app/locale/et.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index f1c434c8a..ca2857b65 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "سطوح" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     creating: "...در حال ایجاد حساب کاربری"
     sign_up: "ثبت نام"
     log_in: "ورود به وسیله رمز عبور"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "ارسال بازخورد"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "تنظیمات حساب کاربری"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index adbc3e06b..99057722d 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     multiplayer: "Moninpeli" # Not currently shown on home page
     for_developers: "Kehittäjille" # Not currently shown on home page.
     or_ipad: "Tai lataa iPad:ille"
-    hoc_class_code: "Minulla on Luokkakoodi"
-    hoc_enter: "Sisään"
-    hoc_title: "Kooditunti?"
 
   nav:
     play: "Tasot" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     creating: "Luodaan tili..."
     sign_up: "Ilmoittaudu"
     log_in: "kirjaudu sisään salasanalla"
-    social_signup: "Tai ilmoittaudu Facebook tai G+ tunnuksilla:"
     required: "Kirjaudu ensin jotta pääset jatkamaan."
     login_switch: "Onko sinulla jo tili?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     incomplete: "Kesken"
     timed_out: "Aika loppui"
     failing: "Epäonnistui"
-    action_timeline: "Toiminto-aikajana"
-    click_to_select: "Jos valitset yksikön, klikkaa sitä."
     control_bar_multiplayer: "Moninpelaaja"
     control_bar_join_game: "Liity peliin"
     reload: "Lataa"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     parents_title: "Hyvät vanhemmat: Teidän lapsenne haluaa oppia ohjelmoimaan. Autatteko häntä oppimaan?"
     parents_blurb1: "Lapsenne on läpäissyt jo __nLevels__ tasoa ja oppinut niissä ohjelmoinnin alkeita. Auta häntä etenemmään tehokkaammin oppimisessaan ostamalla hänelle CodeCombat kuukausitilaus."
     parents_blurb1a: "Ohjelmointi on nykypäivän perustaito, jota lapsenne epäilemättä tarvitsee aikuisena. Vuoteen 2020 mennessä, perusohjelmointitaitoja tarvitaan 77% työtehtävistä, ja koulutettuja ohjelmisto-osaajia tarvitaan ympäri maailman. Tiesitkö myös, että tietojenkäsittelytiede tarjoaa valmistuneille korkeakoulu-opiskelijoille korkeapalkkaisia työmahdollisuuksia?"
-    parents_blurb2: "Hintaan $9.99 USD/kk, lapsenne saa uusia haastavia tehtäviä joka viikko sekä henkilökohtaista sähköpostitukea ammatti-ohjelmoijiltamme."
+    parents_blurb2: "Hintaan ${{price}} USD/kk, lapsenne saa uusia haastavia tehtäviä joka viikko sekä henkilökohtaista sähköpostitukea ammatti-ohjelmoijiltamme."
     parents_blurb3: "Ei riskiä: 100% rahat takaisin takuu, sekä yksinkertainen yhden painalluksen tilausken lopetus."
     payment_methods: "Maksutavat"
     payment_methods_title: "Käytössä olevat maksutavat"
     payment_methods_blurb1: "Tällä hetkellä käytössämme on luottokorttimaksu ja Alipay." # {change}
     payment_methods_blurb2: "Jos haluat käyttää vaihtoehtoista maksutapaa, ole hyvä ja ota yhteyttä"
-    sale_already_subscribed: "Sinulla on jo kuukausitilaus!"
-    sale_blurb1: "Säästä $21" # {change}
-    sale_blurb2: "kuukausitilauksesta, jonka hinta tavallisesti on $120 USD vuodessa!"
     sale_button: "Alennus!"
-    sale_button_title: "Säästä $21 kun ostat kuukausitilauksen koko vuodeksi kerralla" # {change}
-    sale_click_here: "Paina tästä"
-    sale_ends: "Päättyy"
-    sale_extended: "*Olemassaolevia kuukausitilauksia tullaan jatkamaan 12 kuukaudella."
-    sale_feature_here: "Saat kaiken tämän:"
-    sale_feature2: "10 mahtavaa <strong>uutta sankaria</strong> erilaisine kykyineen!"
-    sale_feature4: "<strong>42,000 jalokiveä</strong> toimitettuna välittömästi!"
-    sale_continue: "Oletko valmis jatkamaan seikkailua?"
-    sale_limited_time: "Tarjous voimassa rajoitetun ajan!"
-    sale_new_heroes: "Uusia sankareita!"
-    sale_title: "Koulujen alku-alennusmyynti"
-    sale_view_button: "Osta kuukausitilaus koko vuodeksi hintaan"
+    sale_button_title: "Säästä ${{discount}} kun ostat kuukausitilauksen koko vuodeksi kerralla" # {change}
     stripe_description: "Kuukausittainen tilaus"
-    stripe_description_year_sale: "12 kk:n kuukausitilaus ($21 alennuksella)" # {change}
+    stripe_description_year_sale: "12 kk:n kuukausitilaus (${{discount}} alennuksella)" # {change}
     subscription_required_to_play: "Tarvitset CodeCombat kuukausitilauksen pellataksesi tätä tasoa."
     unlock_help_videos: "Hanki tilaus avataksesi kaikki video-oppaat."
     personal_sub: "Henkilökohtainen tilaus" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     currently_free_until: "Tilauksesi on voimassa"
     was_free_until: "Ilmainen tilauksesi päättyi"
     managed_subs: "Hallinnoidut tilaukset"
-    managed_subs_desc: "Lisää tilaus toiselle pelaajalle (oppilas, lapsesi, jne.)"
-    managed_subs_desc_2: "Vastaanottajalla tulee olla CodeCombat tili liitettynä antamaasi sähköpostiosoitteeseen."
-    group_discounts: "Ryhmäalennukset"
-    group_discounts_1: "Tarjoamme alennettuja hintoja ryhmätilauksille."
-    group_discounts_1st: "Ensimmäinen tilaus"
-    group_discounts_full: "Täysi hinta"
-    group_discounts_2nd: "Tilaukset 2-11"
-    group_discounts_20: "Alennus 20%"
-    group_discounts_12th: "Tilaukset 12+"
-    group_discounts_40: "Alennus40%"
     subscribing: "Tilausta käsitellään..."
-    recipient_emails_placeholder: "Syötä tilausken vastaanottajan sähköpostiosoite, yksi riville."
-    subscribe_users: "Tilaa käyttäjille"
-    users_subscribed: "Tilattu käyttäjille:"
-    no_users_subscribed: "Tilaus ei onnistunut, ole hyvä ja tarksita sähköpostiosoitteet."
     current_recipients: "Tämänhetkiset vastaanottajat"
     unsubscribing: "Tilaus päätetään..." # {change}
     subscribe_prepaid: "Tilaa käyttämällä ennakkomaksettua koodinumeroa"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Lisää tietoa opettajille"
-    intro_1: "CodeCombat on selainpeli, joka opettaa ohjelmointia. Opiskelijat kirjoittavat ohjelmakoodia oikeilla ohjelmointikielillä."
-    intro_2: "Aiempi kokemus ei ole tarpeen!"
-    free_title: "Mitä kaikki maksaa?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "Käytössäsi on 110+ ILMAISTA tasoa, jotka kattavat koko ohjelmoinnin perustan."
-    free_2: "Maksullinen kuukausitilaus avaa pääsyn video-oppaisiin ja lisätasoihin."
-    free_3: "CodeCombat sivusto on jaettu content is divided into"
-    free_4: "kursseihin"
-    free_5: ".  Ensimmäinen kurssi on ilmainen. Se on kestoltaan noin tunnin."
-    free_6: "Pääsyn lisätehtäviin voit avata kertaostoksella."
-    teacher_subs_title: "Opettajat saavat ilmaisen kuukausitilauksen!" # {change}
-    teacher_subs_0: "Tarjoamme ilmaisen kokeilun opettajille."
-    teacher_subs_1: "Ole hyvä ja täytä"
-    teacher_subs_2: "opettajan kysely"
-    teacher_subs_3: "ottaaksesi tilauksesi käyttöön." # {change}
-    sub_includes_title: "Mitä kuukausitilaukseen kuuluu?"
-    sub_includes_1: "110+ perustason lisäksi, kuukausitilaus avaa jokaiselle oppilaalle seuraavat edut:"
-    sub_includes_2: "70+ lisätasoa" # {change}
-    sub_includes_3: "Video-oppaat"
-    sub_includes_4: "Premium sähköpostituki"
-    sub_includes_5: "10 uutta sankaria erilaisine kykyineen"
-    sub_includes_6: "3500 jalokiveä joka kuukausi"
-    sub_includes_7: "Yksityisklaanit"
-    monitor_progress_title: "Kuinka seuraan oppilaitteni edistymistä?"
-    monitor_progress_1: "Oppilaittesi edistymistä voit seurata luomalla oman"
-    monitor_progress_2: "luokallesi."
-    monitor_progress_3: "Lisätäksesi oppilaan klaaniin, lähetä hänelle kutsulinkki, jonka löydät"
-    monitor_progress_4: "sivulta."
-    monitor_progress_5: "Oppilaiden liityttyä klaaniin, näet yhteenvedon heidän edistymisestä Klaanin sivulla."
-    private_clans_1: "Yksityisklaanit tarjoavat enemmän yksityisyyttä ja seikkaperäiset edistymistiedot jokaisesta opiskelijasta."
-    private_clans_2: "Luodaksesi yksityisklaanin, valitse 'Yksityinen klaani' valintaruutu"
-    private_clans_3: "luodessasi."
     who_for_title: "Kenelle CodeCombat on tarkoitettu?"
-    who_for_1: "Suosittelemme CodeCombatia 9 vuotiaille ja vanhemmille oppilaille. Aiempaa ohjelmointiosaamista ei tarvita."
-    who_for_2: "CodeCombat on suunniteltu yhtälailla pojille kuin tytöille."
-    material_title: "Kuinka paljon sisältöä palvelu tarjoaa?"
-    material_premium_server: "Noin 40 tunnin edestä, yli 180+ pelitasoa kuukausitilanneille käyttäjille tähänmennessä." # {change}
-    material_1: "Noin 25 tuntia ilmaista sisältöä ja kuukausitilanneille noin 15 tuntia lisämateriaalia."
-    concepts_title: "Mitkä ohjelmointikonseptit CodeCombat kattaa?"
-    how_much_title: "Minkä verran kuukausitilaus maksaa?"
-    how_much_1: "CodeCombat"
-    how_much_2: "Kuukausitilaus"
-    how_much_3: "maksaa $9.99 USD, ja se voidaan lopettaa milloin tahansa."
-    how_much_4: "Lisäksi, tarjoamme alennuksia ryhmätilauksille seuraavasti:"
-    how_much_5: "Tarjoamme alennuksia kertaostoista ja kuukausitilauksista ryhmille, kuten luokille tai kouluille. Lisätietoja saat ottamalla yhteyttä"
-    how_much_6: "."
+    who_for_1: "Suosittelemme CodeCombatia 9 vuotiaille ja vanhemmille oppilaille. Aiempaa ohjelmointiosaamista ei tarvita." # {change}
+    who_for_2: "CodeCombat on suunniteltu yhtälailla pojille kuin tytöille." # {change}
     more_info_title: "Mistä saan lisätietoa?"
     more_info_1: ""
     more_info_2: "Opettajien foorumi"
     more_info_3: "(keskustelu pääosin englanniksi) on hyvä paikkaia tutustua toisiin opettajiin jotka käyttävät CodeCombatia."
-    sys_requirements_title: "Järjestelmävaatimukset"
-    sys_requirements_1: "Nykyaikainen selainohjelma, kuten Chrome, Firefox, tai Safari joista uusi versio. Internet Explorer 9 tai uudempi."
-    sys_requirements_2: "iPad app CodeCombatista on vasta kehitteillä."
 
   teachers_survey:
     title: "Opettajan kysely"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     screenshot_included: "Kuvankaappaus liitetty."
     where_reply: "Mihin haluatte vastauksen?"
     send: "Lähetä"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Tiliasetukset"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     saved: "Muutokset tallennettu"
     password_mismatch: "Salasanat eivät täsmää."
     password_repeat: "Kirjoita salasana uudestaan."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-    view_profile: "Tutki profiiliasi"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Pikanäppäimet"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     subs_only: "Vain tilanneille"
     create_clan: "Luo uusi klaani"
     private_preview: "Esikatselu"
+#    private_clans: "Private Clans"
     public_clans: "Julkiset klaanit"
     my_clans: "Omat klaanit"
     clan_name: "Klaanin nimi"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     payments: "Ostot"
     prepaid_codes: "Prepaid koodi"
     purchased: "Ostettu"
-    sale: "Alennus"
     subscription: "Kuukausitilaus"
     invoices: "Laskut"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index 33cefb2a5..09c8224c4 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -4,7 +4,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     no_ie: "CodeCombat ne fonctionnera pas sous Internet Explorer 8 ou moins. Désolé !" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat n'a pas été créé pour les plateformes mobiles, il est donc possible qu'il ne fonctionne pas correctement !" # Warning that shows up on mobile devices
     play: "Jouer" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Jouer en mode Campagne" # Shows up under big play button if you only play /courses
     old_browser: "Oh oh, votre navigateur est trop vieux pour exécuter CodeCombat. Désolé !" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Vous pouvez essayer quand même, mais cela ne marchera probablement pas."
     ipad_browser: "Mauvaise nouvelle : CodeCombat ne fonctionne pas avec le navigateur iPad. Bonne nouvelle : notre application est en cours de validation par Apple !"
@@ -13,14 +13,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     multiplayer: "Multijoueurs" # Not currently shown on home page
     for_developers: "Pour développeurs" # Not currently shown on home page.
     or_ipad: "Ou télécharger pour iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Jouer" # The top nav bar entry where players choose which levels to play
     community: "Communauté"
-#    courses: "Courses"
+    courses: "Cours"
     editor: "Éditeur"
     blog: "Blog"
     forum: "Forum"
@@ -36,7 +33,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     contact: "Contact"
     twitter_follow: "Suivre"
     teachers: "Enseignants"
-#    careers: "Careers"
+    careers: "Emplois"
 
   modal:
     close: "Fermer"
@@ -55,7 +52,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 
   play:
     play_as: "Jouer comme " # Ladder page
-#    compete: "Compete!" # Course details page
+    compete: "Participer!" # Course details page
     spectate: "Spectateur" # Ladder page
     players: "Joueurs" # Hover over a level on /play
     hours_played: "Heures jouées" # Hover over a level on /play
@@ -71,14 +68,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     achievements: "Succès" # Tooltip on achievement list button from /play
     account: "Compte" # Tooltip on account button from /play
     settings: "Réglages" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "Sondage" # Tooltip on poll button from /play
     next: "Suivant" # Go from choose hero to choose inventory before playing a level
     change_hero: "Changer le héros" # Go back from choose inventory to choose hero
     buy_gems: "Acheter des gemmes"
     subscription_required: "Enregistrement nécessaire"
     anonymous: "Joueur anonyme"
     level_difficulty: "Difficulté : "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Jouer à la version Classe" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Campagne du Débutant"
     awaiting_levels_adventurer_prefix: "Nous produisons cinq niveaux par semaine." # {change}
     awaiting_levels_adventurer: "S'inscrire comme aventurier"
@@ -87,10 +84,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     campaign_multiplayer: "Campagne multi-joueurs"
     campaign_multiplayer_description: "... dans laquelle vous coderez en face-à-face contre d'autres joueurs."
     campaign_old_multiplayer: "(Obsolète) Ancienne arènes multijoueurs"
-#    campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas."
+    campaign_old_multiplayer_description: "Reliques d'un âge plus civilisé. Il n'y a aucune simulation pour ces vielles arènes multijoueur vides de tout héros."
 
   share_progress_modal:
-    blurb: "Vous faites beaucoup de progrès ! Partagez ce que vous avez appris grâce à CodeCombat avec vos amis." # {change}
+    blurb: "Vous faites beaucoup de progrès ! Partagez ce que vous avez appris grâce à CodeCombat avec vos amis !" # {change}
     email_invalid: "Adresse e-mail non valide"
     form_blurb: "Entres leur adresse e-mail ci-dessous, on leur montrera !"
     form_label: "Adresse e-mail"
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     creating: "Création du compte en cours..."
     sign_up: "S'abonner"
     log_in: "se connecter avec votre mot de passe"
-    social_signup: "Ou, vous pouvez vous identifier avec Facecook ou Google+ :"
     required: "Vous devez être connecté pour voir cela"
     login_switch: "Avez-vous déjà un compte ?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "Nom et ville de votre école"
+    optional: "facultatif"
+    school_name_placeholder: "Exemple : Lycée Champollion, Figeac"
 
   recover:
     recover_account_title: "Récupérer son compte"
@@ -168,9 +164,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     accepted: "Accepté"
     rejected: "Rejeté"
     withdrawn: "Retiré"
-#    accept: "Accept"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    accept: "Accepter"
+    reject: "Refuser"
+    withdraw: "Abandonner"
     submitter: "Soumissionnaire"
     submitted: "Soumis"
     commit_msg: "Message de mise à jour"
@@ -225,12 +221,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     years: "années"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "Niveau terminé:"
+    course: "Cours:"
     done: "Fait"
-#    next_level: "Next Level:"
-#    next_game: "Next game"
-#    show_menu: "Show game menu"
+    next_level: "Niveau Suivant:"
+    next_game: "Prochain jeu"
+    show_menu: "Afficher le menu"
     home: "Accueil" # Not used any more, will be removed soon.
     level: "Niveau" # Like "Level: Dungeons of Kithgard"
     skip: "Passer"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     incomplete: "Incomplet"
     timed_out: "Plus de temps"
     failing: "Échec"
-    action_timeline: "Action sur la ligne de temps"
-    click_to_select: "Clique sur une unité pour la sélectionner."
     control_bar_multiplayer: "Multi-joueurs"
     control_bar_join_game: "Rejoindre la partie"
     reload: "Recommencer"
@@ -262,7 +256,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     victory_saving_progress: "Sauvegarder la progression"
     victory_go_home: "Retourner à l'accueil"
     victory_review: "Dites-nous en plus !"
-#    victory_review_placeholder: "How was the level?"
+    victory_review_placeholder: "Comment était ce niveau?"
     victory_hour_of_code_done: "Déjà fini ?"
     victory_hour_of_code_done_yes: "Oui, j'ai fini mon heure de code !"
     victory_experience_gained: "XP gagnée"
@@ -303,7 +297,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tip_scrub_shortcut: "Ctrl+[ and Ctrl+] : rembobinage et avance rapide." # {change}
     tip_guide_exists: "Cliquez sur le guide en haut de la page pour des informations utiles."
     tip_open_source: "CodeCombat est 100% open source !"
-#    tip_tell_friends: "Enjoying CodeCombat? Tell your friends about us!"
+    tip_tell_friends: "Vous aimez CodeCombat? Parlez de nous à vos amis!"
     tip_beta_launch: "La beta de CodeCombat a été lancée en Octobre 2013"
     tip_think_solution: "Reflechissez à propos de la solution et non du problème."
     tip_theory_practice: "En théorie, il n'y a pas de différence entre la théorie et la pratique. Mais en pratique, il y en a. - Yogi Berra"
@@ -347,8 +341,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tip_recurse: "Itérer c'est humain, mais faire des récursion, c'est divin. - L. Peter Deutsch"
     tip_free_your_mind: "Vous devez laisser aller , Neo . La peur , le doute et l'incrédulité . Libère ton esprit. - Morpheus"
     tip_strong_opponents: "Même les ennemis les plus puissant ont une faiblesse. - Itachi Uchiha"
-#    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_paper_and_pen: "Avant de commencer à coder, vous pouvez plannifier les choses sur papier."
+    tip_solve_then_write: "D'abord, résolvez le problème. Ensuite, écrivez le code. - John Johnson"
 
   game_menu:
     inventory_tab: "Inventaire"
@@ -416,7 +410,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     feature7: "<strong>Clans</strong> privés"
     free: "Gratuit"
     month: "mois"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+    must_be_logged: "Vous devez être identifié. Veuillez créer un compte ou vous identifier depuis le menu ci-dessus."
     subscribe_title: "Abonnement"
     unsubscribe: "Désinscription"
     confirm_unsubscribe: "Confirmer la désinscription"
@@ -438,55 +432,27 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     parents_title: "Votre enfant va apprendre à programmer." # {change}
     parents_blurb1: "Avec CodeCombat, votre enfant apprend en écrivant de vrais programmes. Il commence en apprenant des instructions simples, puis progresse sur des thèmes plus complexes."
     parents_blurb1a: "La programmation informatique est une compétence essentielle que votre fils va indubitablement utiliser comme un adulte. En 2020, les compétences basiques en informatique seront obligatoires pour 77% des travails, et les ingénieurs logiciels seront fortement demandés partout dans le monde. Saviez-vous que l'informatique est la compétence universitaire la mieux payée ?"
-    parents_blurb2: "Pour $9.99 USD/mois, il obtient de nouveaux défis chaque semaine et le support par e-mail de programmeurs professionnels." # {change}
+    parents_blurb2: "Pour ${{price}} USD/mois, il obtient de nouveaux défis chaque semaine et le support par e-mail de programmeurs professionnels." # {change}
     parents_blurb3: "Pas de risque : garantie 100% remboursé, désinscription facile en 1 clic."
     payment_methods: "Moyens de paiement"
     payment_methods_title: "Moyens de paiement acceptés"
     payment_methods_blurb1: "Nous acceptons, pour le moment, les cartes de crédit et les paiment par Alipay." # {change}
     payment_methods_blurb2: "Si vous avez besoins d'un autre moyen de paiement, merci de nous contacter"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
-#    sale_button: "Sale!"
-#    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
+    sale_button: "Promotion!"
+    sale_button_title: "Économisez 21$ en achetant un abonnement d'un an"
     stripe_description: "Inscription mensuelle"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+    stripe_description_year_sale: "1 an d'abonnement (Économie de {{discount}}$ !)"
     subscription_required_to_play: "Vous avez besoin d'un abonnement pour jouer à ce niveau."
     unlock_help_videos: "Abonnez vous pour débloquer tous les tutoriels vidéo."
     personal_sub: "Abonnement individuel" # Accounts Subscription View below
     loading_info: "Chargement des informations sur votre abonnement..."
     managed_by: "Gérer par"
-    will_be_cancelled: "Ceci va être annuler"
+    will_be_cancelled: "Ceci va être annulé"
     currently_free: "Vous avez un abonnement gratuit en ce moment"
     currently_free_until: "Vous avez un abonnement gratuit jusqu'à"
     was_free_until: "Vous aviez un abonnement gratuit jusqu'à"
     managed_subs: "Gestion des abonnements"
-    managed_subs_desc: "Ajout d'abonnements pour les autres joueurs (étudiants,enfants,etc.) for other players."
-    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-    group_discounts: "Rabais de groupes"
-    group_discounts_1: "Nous offrons des rabais de groupe pour les gros abonnements"
-    group_discounts_1st: "Premier abonnement"
-    group_discounts_full: "Plein prix"
-    group_discounts_2nd: "Abonnements 2-11"
-    group_discounts_20: "Rabais de 20%"
-    group_discounts_12th: "Abonnements 12+"
-    group_discounts_40: "Rabais de 40%"
     subscribing: "S'inscrit..."
-    recipient_emails_placeholder: "Entrez votre courriel pour vous abonner, un par ligne."
-    subscribe_users: "Seulement pour les usagers aboonés"
-    users_subscribed: "Usagers abonnés:"
-    no_users_subscribed: "Aucun usager abonnés, veuillez vérifier vos courriels."
     current_recipients: "Recipients courant"
     unsubscribing: "Desincription en cours..." # {change}
     subscribe_prepaid: "Cliquer S'abonner pour utiliser du code prépayé"
@@ -533,9 +499,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
   skill_docs:
     writable: "éditable" # Hover over "attack" in Your Skills while playing a level to see most of this
     read_only: "lecture seulement"
-#    action: "Action"
-#    spell: "Spell"
-    action_name: "nom"
+    action: "Action"
+    spell: "Sort"
+    action_name: "Nom"
     action_cooldown: "Durée"
     action_specific_cooldown: "Rechargement"
     action_damage: "Dégât"
@@ -598,105 +564,60 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     matt_blurb: "Bicycliste"
     cat_title: "Chef Artisan"
     cat_blurb: "Seigneur de l'air"
-    josh_title: "Designer de jeu"
+    josh_title: "Game Designer"
     josh_blurb: "Le plancher est de la lave"
     jose_title: "Musique"
     jose_blurb: "Décollage"
     retrostyle_title: "Illustration"
-#    retrostyle_blurb: "RetroStyle Games"
+    retrostyle_blurb: "Jeux RetroStyle"
 #    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
-#    josh_c_title: "Game Designer"
-#    josh_c_blurb: "Designs games"
-#    carlos_title: "Region Manager, Brazil"
-#    carlos_blurb: "Celery Man"
+    josh_c_title: "Game Designer"
+    josh_c_blurb: "Conçoit des jeux"
+    carlos_title: "Manager de la région Brésil"
+    carlos_blurb: "Homme-céleri"
+    maka_title: "Responsable clientèle"
+    maka_blurb: "Conteur"
 
   teachers:
-#    more_info: "More Info for Teachers"
-    intro_1: "CodeCombat est un jeu en ligne qui enseigne la programmation. Les élèves écrivent du code dans de vrais langages de programmation."
-    intro_2: "Aucune expérience requise !"
-    free_title: "Combien cela coûte-t-il ?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "La version de base de CodeCombat est gratuite ! Il y a 70+ niveaux gratuits qui couvrent chaque concepts." # {change}
-    free_2: "Un abonnement mensuel fournit l'accès à des vidéos de tutoriels ainsi qu'à des niveaux d'entraînement supplémentaires."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Les enseignants reçoivent un abonnement gratuit !" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Merci de nous contacter" # {change}
-    teacher_subs_2: "pour obtenir un abonnement mensuel gratuit." # {change}
-#    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "Qu'y a t-il d'inclus dans cet abonnement ?"
-    sub_includes_1: "En plus des 70+ niveaux de base, les élèves avec un abonnement mensuel ont accès à ces fonctionnalités supplémentaires :" # {change}
-    sub_includes_2: "40+ niveaux d'entrainement" # {change}
-    sub_includes_3: "Des tutoriels vidéo"
-    sub_includes_4: "Support email premium"
-    sub_includes_5: "7 nouveaux héros avec des capacités uniques à maitriser" # {change}
-    sub_includes_6: "3500 gemmes bonus chaque mois"
-    sub_includes_7: "Clans Privées"
-    monitor_progress_title: "Comment puis-je faire pour surveiller les progrès des étudiants?"
-    monitor_progress_1: "Le progès des étudiants peut être surveiller en créant un"
-    monitor_progress_2: "pour votre classe"
-    monitor_progress_3: "Pour ajouter un étudiant, envoyer leur le lien contenant une invitation pour votre Clan"
-    monitor_progress_4: "page."
-    monitor_progress_5: "Après leur adhésion, vous verrez un résumé des progrès de l'élève sur la page de votre clan."
-    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-    private_clans_2: "Pour créer un Clan privé, veuillez vous référer à la boîte à cocher 'Faire un clan privé' pendant la création du"
-    private_clans_3: "."
     who_for_title: "A qui CodeCombat est-il destiné ?"
-    who_for_1: "Nous recommandons CodeCombat pour les élèves âgés de 9 ans ou plus. Aucune expérience préalable de programmation n'est requise."
-    who_for_2: "Nous avons conçu CodeCombat pour plaire à la fois aux garçons et aux filles."
-    material_title: "Quelle quantité de contenu y a t-il ?"
-    material_premium_server: "Il y a en moyenne une trentaine d'heures de temps de jeu distribué sur plus de 140 abonnés jusqu'à maintenant avec des nouveaux niveaux qui s'ajoutent à chaque semaine." # {change}
-    material_1: "Environ 8 heures de contenu gratuit et 14 heures de contenu supplémentaire reservé aux abonnés, avec 5 nouveaux niveaux chaque semaines." # {change}
-    concepts_title: "Quels concepts sont couverts ?"
-    how_much_title: "Combien coûte un abonnement mensuel ?"
-    how_much_1: "Un"
-    how_much_2: "abonnement mensuel"
-    how_much_3: "coûte $9.99 et peut être annulé à n'importe quel moment."
-    how_much_4: "De plus, nous fournissons des remises pour les grands groupes :"
-    how_much_5: "Nous acceptons les achats ponctuels à rabais ainsi que les abonnements pour les groupes, tel que pour une classe ou un groupe. Veuillez nous contacter."
-    how_much_6: "pour plus de détails"
+    who_for_1: "Nous recommandons CodeCombat pour les élèves âgés de 9 ans ou plus. Aucune expérience préalable de programmation n'est requise." # {change}
+    who_for_2: "Nous avons conçu CodeCombat pour plaire à la fois aux garçons et aux filles." # {change}
     more_info_title: "À quel endroit je peux trouver plus de détails ?"
     more_info_1: "Notre"
     more_info_2: "forum d'enseignants"
     more_info_3: "C'est un bon endroit pour faire des relations entre vos camarades éducateurs utilisant CodeCombat"
-    sys_requirements_title: "Configuration requise"
-    sys_requirements_1: "Un navigateur moderne. La dernière version de Chrome, Firefox, ou de Safari. Internet Explorer 9 ou plus récent."
-    sys_requirements_2: "CodeCombat n'est pas encore supporté sur iPad."
 
   teachers_survey:
-#    title: "Teacher Survey"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-#    retrieving: "Retrieving information..."
-#    being_reviewed_1: "Your application for a free trial is being"
-#    being_reviewed_2: "reviewed."
-#    approved_1: "Your application for a free trial was"
-#    approved_2: "approved!"
+    title: "Questionnaire professeurs"
+    must_be_logged: "Vous devez être identifié. Veuillez créer un compte ou vous identifier depuis le menu ci-dessus."
+    retrieving: "Récupération des informations..."
+    being_reviewed_1: "Votre demande pour un essai gratuit est en train d'être"
+    being_reviewed_2: "étudié."
+    approved_1: "Votre demande pour un essai gratuit a été"
+    approved_2: "validé!"
 #    approved_4: "You can now enroll your students on the"
 #    approved_5: "courses"
 #    approved_6: "page."
-#    denied_1: "Your application for a free trial has been"
-#    denied_2: "denied."
-#    contact_1: "Please contact"
-#    contact_2: "if you have further questions."
+    denied_1: "Votre demande pour un essai gratuit a été"
+    denied_2: "refusée."
+    contact_1: "Veuillez contacter"
+    contact_2: "si vous avez d'autres questions."
 #    description_1: "We offer free trials to teachers.  You will be given 2 free enrollments which can be used to enroll students in paid courses."
-#    description_1b: "You can find more information on our"
-#    description_2: "teachers"
-#    description_3: "page."
-#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
+    description_1b: "Vous pourrez retrouver plus d'informations sur notre"
+    description_2: "teachers"
+    description_3: "page."
+    description_4: "Veuillez remplir ce questionnaire et nous vous enverrons les instructions par email."
     email: "Adresse email"
     school: "Nom de l'école"
     location: "Nom de la ville"
-#    age_students: "How old are your students?"
-#    under: "Under"
-#    other: "Other:"
-#    amount_students: "How many students do you teach?"
-#    hear_about: "How did you hear about CodeCombat?"
-#    fill_fields: "Please fill out all fields."
-#    thanks: "Thanks! We'll send you setup instructions shortly."
+    age_students: "Quel âge ont vos élèves?"
+    under: "Moins de"
+    other: "Autre:"
+    amount_students: "À combien d'étudiants enseignez-vous ?"
+    hear_about: "Comment avez-vous connu CodeCombat?"
+    fill_fields: "Prière de remplir tous les champs."
+    thanks: "Merci! Nous vous enverrons rapidement les instructions."
 
   versions:
     save_version_title: "Enregistrer une nouvelle version"
@@ -706,7 +627,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     cla_url: "Copyright"
     cla_suffix: "."
     cla_agree: "J'accepte"
-#    owner_approve: "An owner will need to approve it before your changes will become visible."
+    owner_approve: "Un propriétaire devra l'approuver avant que vos changements ne soient visibles."
 
   contact:
     contact_us: "Contacter CodeCombat"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     screenshot_included: "Capture d'écran ajoutée."
     where_reply: "Où devons-nous répondre ?"
     send: "Envoyer un commentaire"
-    contact_candidate: "Contacter le candidat" # Deprecated
-    recruitment_reminder: "Utilisez ce formulaire pour entrer en contact avec le candidat qui vous intéresse. Souvenez-vous que CodeCombat facture 15% de la première année de salaire. Ces frais sont dus à l'embauche de l'employé, ils sont remboursables pendant 90 jours si l'employé ne reste pas employé. Les employés à temps partiel, à distance ou contractuel sont gratuits en tant que stagiaires." # Deprecated
 
   account_settings:
     title: "Préférences du compte"
@@ -737,18 +656,18 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     wrong_password: "Mauvais mot de passe"
     upload_picture: "Télécharger une image"
     delete_this_account: "Supprimer votre compte définitivement"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
+    reset_progress_tab: "Réinitialiser toute la progression"
+    reset_your_progress: "Supprimer toute votre progression et recommencer à zéro"
     god_mode: "Puissance Divine"
     password_tab: "Mot de passe"
     emails_tab: "E-mails"
     admin: "Admin"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "Cliquez ici pour gérer votre abonnement.."
     new_password: "Nouveau mot de passe"
     new_password_verify: "Vérifier"
     type_in_email: "Entrez votre adresse e-mail pour confirmer la supression de votre compte"
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
-#    type_in_password: "Also, type in your password."
+    type_in_email_progress: "Entrez votre adresse e-mail pour confirmer la supression de votre progression."
+    type_in_password: "Entrez aussi votre mot de passe."
     email_subscriptions: "Abonnements"
     email_subscriptions_none: "Aucun e-mail d'abonnement."
     email_announcements: "Annonces"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     saved: "Changements sauvegardés"
     password_mismatch: "Le mot de passe ne correspond pas."
     password_repeat: "Veuillez s'il vous plaît répéter votre mot de passe"
-    job_profile: "Profil d'emploi" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Votre profil d'emploi a été approuvé par CodeCombat. Les employeurs seront en mesure de voir votre profil jusqu'à ce que vous le marquiez inactif ou qu'il n'aie pas été changé pendant quatre semaines."
-    job_profile_explanation: "Salut ! Remplissez-le et nous prendrons contact pour vous trouver un emploi de développeur de logiciels."
-    sample_profile: "Voir un exemple de profil"
-    view_profile: "Voir votre profil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Raccourcis Clavier"
@@ -785,11 +699,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     run_code: "Exécuter le code actuel."
     run_real_time: "Exécuter en temps réel."
     continue_script: "Continuer le script passé courant."
-#    skip_scripts: "Skip past all skippable scripts."
+    skip_scripts: "Passer le plus de scripts possibles."
     toggle_playback: "Basculer entre lecture/pause."
-#    scrub_playback: "Scrub back and forward through time."
-#    single_scrub_playback: "Scrub back and forward through time by a single frame."
-#    scrub_execution: "Scrub through current spell execution."
+    scrub_playback: "Avancer et reculer dans le temps."
+    single_scrub_playback: "Avancer et reculer dans le temps au coup par coup."
+    scrub_execution: "Avancer dans l'exécution du sort."
     toggle_debug: "Afficher la console de déboggage"
     toggle_grid: "Afficher une grille"
     toggle_pathfinding: "Toggle pathfinding overlay."
@@ -806,7 +720,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     article_editor_prefix: "Vous voyez une erreur dans certaines de nos docs ? Vous voulez faire des instructions pour vos propres créations ? Découvrez-le"
     article_editor_suffix: "et aidez les joueurs CodeCombat à tirer le meilleur parti de leur temps de jeu."
     find_us: "Trouvez-nous sur ces sites"
-#    social_github: "Check out all our code on GitHub"
+    social_github: "Venez voir tous les codes sources sur Github"
     social_blog: "Lire le blog CodeCombat sur Sett"
     social_discource: "Participez à la discussion sur notre forum Discourse"
     social_facebook: "Aimer CodeCombat sur Facebook"
@@ -824,7 +738,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     subs_only: "Abonnés seulement"
     create_clan: "Créer un nouveau clan"
     private_preview: "Aperçu"
-    public_clans: "Clans publiques"
+    private_clans: "Clans privés"
+    public_clans: "Clans publics"
     my_clans: "Mes clans"
     clan_name: "Nom du clan"
     name: "Nom"
@@ -855,246 +770,249 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     started_2: "Démarré"
     not_started_2: "Non démarré"
     view_solution: "Cliquer pour voir la solution"
-#    view_attempt: "Click to view attempt."
+    view_attempt: "Cliquer pour voir la tentative."
     latest_achievement: "Réalisation Récentes"
     playtime: "Temps de jeu"
     last_played: "Dernière période de jeu"
-#    leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
+    leagues_explanation: "Jouer dans une ligue contre d'autres membres de clan dans cette arène multijoueurs.."
 #    track_concepts1: "Track concepts"
-#    track_concepts2a: "learned by each student"
-#    track_concepts2b: "learned by each member"
-#    track_concepts3a: "Track levels completed for each student"
-#    track_concepts3b: "Track levels completed for each member"
+    track_concepts2a: "appris par chaque élèves"
+    track_concepts2b: "appris par chaque membres"
+    track_concepts3a: "Suivre les niveaux complétés par chaque élèves"
+    track_concepts3b: "Suivre les niveaux complétés par chaque membres"
 #    track_concepts4a: "See your students'"
 #    track_concepts4b: "See your members'"
-#    track_concepts5: "solutions"
-#    track_concepts6a: "Sort students by name or progress"
-#    track_concepts6b: "Sort members by name or progress"
-#    track_concepts7: "Requires invitation"
+    track_concepts5: "solutions"
+    track_concepts6a: "Classer les élèves par nom ou avancement"
+    track_concepts6b: "Classer les membres par nom ou avancement"
+    track_concepts7: "Nécessite une invitation"
 #    track_concepts8: "to join"
-#    private_require_sub: "Private clans require a subscription to create or join."
+    private_require_sub: "Les clans privés nécessitent un abonnement pour être créés ou rejoins."
 
-#  courses:
-#    course: "Course"
-#    courses: "courses"
-#    create_new_class: "Create New Class"
+  courses:
+    course: "Cours"
+    courses: "cours"
+    create_new_class: "Créer une Nouvelle Classe"
 #    not_enrolled: "You are not enrolled in this course."
 #    visit_pref: "Please visit the"
 #    visit_suf: "page to enroll."
-#    select_class: "Select one of your classes"
+    select_class: "Selectionnez l'une de vos classes"
 #    unnamed: "*unnamed*"
-#    select: "Select"
+    select: "Selectionner"
 #    unnamed_class: "Unnamed Class"
-#    edit_settings: "edit class settings"
-#    edit_settings1: "Edit Class Settings"
-#    progress: "Class Progress"
-#    add_students: "Add Students"
-#    stats: "Statistics"
-#    total_students: "Total students:"
-#    average_time: "Average level play time:"
-#    total_time: "Total play time:"
-#    average_levels: "Average levels completed:"
-#    total_levels: "Total levels completed:"
+    edit_settings: "modifier les réglages de la classe"
+    edit_settings1: "Modifier les Réglages de la Classe"
+    progress: "Evolution de la Classe"
+    add_students: "Ajouter des Elèves"
+    stats: "Statistiques"
+    total_students: "Nom total d'élèves:"
+    average_time: "Temps moyen de jeu par niveau:"
+    total_time: "Temps total de jeu:"
+    average_levels: "Nombre de niveaux moyen complétés:"
+    total_levels: "Total de niveaux complétés:"
 #    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
-#    students: "Students"
-#    students1: "students"
-#    concepts: "Concepts"
-#    levels: "levels"
-#    played: "Played"
-#    play_time: "Play time:"
+    concepts_covered: "Conceptes Couverts"
+    students: "Elèves"
+    students1: "éleves"
+    concepts: "Conceptes"
+    levels: "niveaux"
+    played: "Joué"
+    play_time: "Temps de jeu:"
 #    completed: "Completed:"
-#    invite_students: "Invite students to join this class."
-#    invite_link_header: "Link to join course"
-#    invite_link_p_1: "Give this link to students you would like to have join the course."
+    invite_students: "Inviter des élèves à rejoindre cette classe."
+    invite_link_header: "Lien pour rejoindre le cours"
+    invite_link_p_1: "Partagez ce lien aux élèves voulant rejoindre le cours."
 #    invite_link_p_2: "Or have us email them directly:"
 #    capacity_used: "Course slots used:"
-#    enter_emails: "Enter student emails to invite, one per line"
-#    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
-#    creating_class: "Creating class..."
-#    purchasing_course: "Purchasing course..."
-#    buy_course: "Buy Course"
-#    buy_course1: "Buy this course"
-#    create_class: "Create Class"
-#    select_all_courses: "Select 'All Courses' for a 50% discount!"
-#    all_courses: "All Courses"
-#    number_students: "Number of students"
-#    enter_number_students: "Enter the number of students you need for this class."
-#    name_class: "Name your class"
-#    displayed_course_page: "This will be displayed on the course page for you and your students. It can be changed later."
-#    buy: "Buy"
-#    purchasing_for: "You are purchasing a license for"
-#    creating_for: "You are creating a class for"
-#    for: "for" # Like in 'for 30 students'
+    enter_emails: "Entrez les emails des élèves à inviter, à raisin d'un par ligne"
+    send_invites: "Envoyer les nvitations"
+    title: "Titre"
+    description: "Description"
+    creating_class: "Creation de la classe..."
+    purchasing_course: "Achat de cours..."
+    buy_course: "Acheter des Cours"
+    buy_course1: "Acheter ce cours"
+    create_class: "Créer une Classe"
+    select_all_courses: "Sélectionnez 'Tous les cours' pour une réduction de 50%!"
+    all_courses: "Tous les Cours"
+    number_students: "Nombre d'élèves"
+    enter_number_students: "Entrez le nombre d'élèves dont vous avez besoin pour cette classe."
+    name_class: "Nommez votre classe"
+    displayed_course_page: "Cette information sera affichée sur la page des cours pour vous et vos élèves. Elle pourra être changée plus tard."
+    buy: "Acheter"
+    purchasing_for: "Vous achetez une licence pour"
+    creating_for: "Vous créez une classe pour"
+    for: "pour" # Like in 'for 30 students'
 #    receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
-#    free_trial: "Free trial for teachers!"
+    free_trial: "Essai gratuit pour les professeurs!"
 #    get_access: "to get individual access to all courses for evalutaion purposes."
-#    questions: "Questions?"
-#    teachers_click: "Teachers Click Here"
-#    students_click: "Students Click Here"
-#    courses_on_coco: "Courses on CodeCombat"
+    questions: "Questions?"
+    teachers_click: "Professeurs, Clickez Ici"
+    students_click: "Elèves, Clickez Ici"
+    courses_on_coco: "Cours sur CodeCombat"
 #    designed_to: "Courses are designed to introduce computer science concepts using CodeCombat's fun and engaging environment. CodeCombat levels are organized around key topics to encourage progressive learning, over the course of 5 hours."
-#    more_in_less: "Learn more in less time"
-#    no_experience: "No coding experience necesssary"
-#    easy_monitor: "Easily monitor student progress"
+    more_in_less: "Apprenez plus en moins de temps"
+    no_experience: "Aucune expérience en développement requise"
+    easy_monitor: "Suivez facilement la progression des élèves"
 #    purchase_for_class: "Purchase a course for your entire class. It's easy to sign up your students!"
 #    see_the: "See the"
-#    more_info: "for more information."
-#    choose_course: "Choose Your Course:"
-#    enter_code: "Enter an unlock code to join an existing class"
-#    enter_code1: "Enter unlock code"
+    more_info: "pour plus d'informations."
+    choose_course: "Choisissez votre cours:"
+    enter_code: "Entrez un code de déverouillage pour rejoindre une classe existante"
+    enter_code1: "Entrez le code de déverouillage"
 #    enroll: "Enroll"
 #    pick_from_classes: "Pick from your current classes"
-#    enter: "Enter"
-#    or: "Or"
-#    topics: "Topics"
+    enter: "Entrer"
+    or: "Ou"
+    topics: "Sujets"
 #    hours_content: "Hours of content:"
-#    get_free: "Get FREE course"
+    get_free: "Obtenez des cours GRATUITS"
 #    enroll_paid: "Enroll Students in Paid Courses"
-#    you_have1: "You have"
+    you_have1: "Vous avez"
 #    you_have2: "unused paid enrollments"
 #    use_one: "Use 1 paid enrollment for"
 #    use_multiple: "Use paid enrollments for the following students:"
 #    already_enrolled: "already enrolled"
-#    licenses_remaining: "licenses remaining:"
+    licenses_remaining: "licenses restantes:"
 #    insufficient_enrollments: "insufficient paid enrollments"
 #    enroll_students: "Enroll Students"
 #    get_enrollments: "Get More Enrollments"
-#    change_language: "Change Course Language"
+    change_language: "Changez la langue du cours"
 #    keep_using: "Keep Using"
-#    switch_to: "Switch To"
+    switch_to: "Changer"
 #    greetings: "Greetings!"
-#    learn_p: "Learn Python"
-#    learn_j: "Learn JavaScript"
-#    language_cannot_change: "Language cannot be changed once students join a class."
-#    back_classrooms: "Back to my classrooms"
-#    back_courses: "Back to my courses"
-#    edit_details: "Edit class details"
+    learn_p: "Apprendre Python"
+    learn_j: "Apprendre JavaScript"
+    language_cannot_change: "Le language ne peut être changé une fois qu'un élève à rejoins la classe."
+    back_classrooms: "Retour à mes classes"
+    back_courses: "Retour à mes cours"
+    edit_details: "Modifier les informations de la classe"
 #    enrolled_courses: "enrolled in paid courses:"
 #    purchase_enrollments: "Purchase Enrollments"
-#    remove_student: "remove student"
-#    assign: "Assign"
+    remove_student: "enlever l'élève"
+    assign: "Assigner"
 #    to_assign: "to assign paid courses."
-#    teacher: "Teacher"
-#    complete: "Complete"
-#    none: "None"
-#    save: "Save"
-#    play_campaign_title: "Play the Campaign"
-#    play_campaign_description: "You’re ready to take the next step! Explore hundreds of challenging levels, learn advanced programming skills, and compete in multiplayer arenas!"
-#    create_account_title: "Create an Account"
+    teacher: "Professeur"
+    complete: "Terminer"
+    none: "Aucun"
+    save: "Sauvegarder"
+    play_campaign_title: "Jouer la Campagne"
+    play_campaign_description: "Vous êtes prêts pour la prochaine étape! Explorez des centaines de niveaux stimulants, apprenez al programmation avancée, et rivalisez avec d'autres dans les arènes multijoueurs!"
+    create_account_title: "Créer un compte"
 #    create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!"
-#    preview_campaign_title: "Preview Campaign"
-#    preview_campaign_description: "Take a sneak peek at all that CodeCombat has to offer before signing up for your FREE account."
-#    arena: "Arena"
-#    arena_soon_title: "Arena Coming Soon"
-#    arena_soon_description: "We are working on a multiplayer arena for classrooms at the end of"
+    preview_campaign_title: "Campagne de démonstration"
+    preview_campaign_description: "Ayez un aperçu de tout ce dont CodeCombat a à offrir avant de s'enregistrer GRATUITEMENT."
+    arena: "Arène"
+    arena_soon_title: "L'Arene arrive prochainement"
+    arena_soon_description: "Nous travaillons sur une arene multijoueur pour les classes à la fin de"
 #    not_enrolled1: "Not enrolled"
 #    not_enrolled2: "Ask your teacher to enroll you in the next course."
-#    next_course: "Next Course"
-#    coming_soon1: "Coming soon"
+    next_course: "Cours suivant"
+    coming_soon1: "Prochainement"
 #    coming_soon2: "We are hard at work making more courses for you!"
-#    available_levels: "Available Levels"
-#    welcome_to_courses: "Adventurers, welcome to Courses!"
-#    ready_to_play: "Ready to play?"
-#    start_new_game: "Start New Game"
-#    play_now_learn_header: "Play now to learn"
-#    play_now_learn_1: "basic syntax to control your character"
-#    play_now_learn_2: "while loops to solve pesky puzzles"
-#    play_now_learn_3: "strings & variables to customize actions"
-#    play_now_learn_4: "how to defeat an ogre (important life skills!)"
-#    welcome_to_page: "Welcome to your Courses page!"
+    available_levels: "Niveaux disponibles"
+    welcome_to_courses: "Aventurier, bienvenu dans les leçons!"
+    ready_to_play: "Prêt à jouer?"
+    start_new_game: "Nouvelle Partie"
+    play_now_learn_header: "Jouer pour apprendre"
+    play_now_learn_1: "la syntaxe basique pour controller votre personnage"
+    play_now_learn_2: "les boucles while pour résoudre des problèmes complexes"
+    play_now_learn_3: "des chaines de caractères & des variables pour personnaliser des actions"
+    play_now_learn_4: "comment battre un ogre (compétence importante dans la vie!)"
+    welcome_to_page: "Bienvenu sur la page des Cours!"
 #    completed_hoc: "Amazing! You've completed the Hour of Code course!"
-#    ready_for_more_header: "Ready for more? Play the campaign mode!"
-#    ready_for_more_1: "Use gems to unlock new items!"
-#    ready_for_more_2: "Play through brand new worlds and challenges"
-#    ready_for_more_3: "Learn even more programming!"
-#    saved_games: "Saved Games"
-#    hoc: "Hour of Code"
-#    my_classes: "My Classes"
-#    class_added: "Class successfully added!"
-#    view_class: "view class"
-#    view_levels: "view levels"
-#    join_class: "Join A Class"
+    ready_for_more_header: "Motivé pour plus? Jouez au mode campagne!"
+    ready_for_more_1: "Utilisez des gemmes pour débloquer de nouveaux acessoires!"
+    ready_for_more_2: "Jouez à travers de nouveaux mondes et challenges"
+    ready_for_more_3: "Apprenez encore plus de programmation!"
+    saved_games: "Parties enregistrées"
+    hoc: "Heures de Code"
+    my_classes: "Mes Classes"
+    class_added: "Classe ajoutée avec succès!"
+    view_class: "voir la classe"
+    view_levels: "voir les niveaux"
+    join_class: "Rejoindre une classe"
 #    ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:"
-#    enter_c_code: "<Enter Class Code>"
-#    join: "Join"
+    enter_c_code: "<Entrer le Code de la Classe>"
+    join: "Rejoindre"
 #    joining: "Joining class"
-#    course_complete: "Course Complete"
-#    play_arena: "Play Arena"
-#    start: "Start"
-#    last_level: "Last Level"
+    course_complete: "Cours Terminé"
+    play_arena: "Jouer à l'Arene"
+    start: "Démarrer"
+    last_level: "Dernier Niveau"
 #    welcome_to_hoc: "Adventurers, welcome to our Hour of Code!"
-#    logged_in_as: "Logged in as:"
-#    not_you: "Not you?"
-#    welcome_back: "Hi adventurer, welcome back!"
-#    continue_playing: "Continue Playing"
-#    more_options: "More options:"
-#    option1_header: "Option 1: Invite students via email"
-#    option1_body: "Students will automatically be sent an invitation to join this class, and will need to create an account with a username and password."
-#    option2_header: "Option 2: Send URL to your students"
-#    option2_body: "Students will be asked to enter an email address, username and password to create an account."
-#    option3_header: "Option 3: Direct students to codecombat.com/courses"
-#    option3_body: "Give students the following passcode to enter along with an email address, username and password when they create an account."
-#    thank_you_pref: "Thank you for your purchase! You can now assign"
-#    thank_you_suff: "more students to paid courses."
-#    return_to_class: "Return to classroom"
-#    return_to_course_man: "Return to course management."
+    logged_in_as: "Connecté en tant que:"
+    not_you: "Pas vous?"
+    welcome_back: "Salut aventurier, content de te revoir!"
+    continue_playing: "Continuer à Jouer"
+    more_options: "Plus d'options:"
+    option1_header: "Option 1: Inviter les élèves par email"
+    option1_body: "Les élèves recevront automatiquement une invitation à rejoindre cette classe, et devront créer un compte avec un nom d'utilisateur et mot de passe."
+    option2_header: "Option 2: Envoyez l'URL à vos élèves"
+    option2_body: "Il sera demandé aux élèves de saisir une adresse email, un nom d'utilisateur et un mot de passe pour créer un compte."
+    option3_header: "Option 3: Dirigez les élèves sur codecombat.com/courses"
+    option3_body: "Donnez aux élèves le code suivant à spécifier avec une adresse email, un nom d'utilisateur, et un mot de passe lors de la création de compte."
+    thank_you_pref: "Merci pour votre achat! Vous pouvez maintenant assigner"
+    thank_you_suff: "plus d'élèves à des cours payants."
+    return_to_class: "Retourner à la classe"
+    return_to_course_man: "Retourn à la gestion des cours."
 #    students_not_enrolled: "students not enrolled"
-#    total_all_classes: "Total Across All Classes"
+    total_all_classes: "Total Dans Toutes Les Classes"
 #    how_many_enrollments: "How many additional paid enrollments do you need?"
 #    each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually."
-#    purchase_now: "Purchase Now"
+    purchase_now: "Achetez Maintenant"
 #    enrollments: "enrollments"
-#    remove_student1: "Remove Student"
-#    are_you_sure: "Are you sure you want to remove this student from this class?"
-#    remove_description1: "Student will lose access to this classroom and assigned classes. Progress and gameplay is NOT lost, and the student can be added back to the classroom at any time."
+    remove_student1: "Supprimer l'Elève"
+    are_you_sure: "Etes-vous certain de vouloir supprimer cet élève de cette classe?"
+    remove_description1: "L'élève n'aura plus accès à cette classe et les classes associées. L'évolution et les personnages ne seront pas supprimés, et l'élève pourra de nouveau rejoindre la classe n'importe quand."
 #    remove_description2: "The activated paid license will not be returned."
-#    keep_student: "Keep Student"
-#    removing_user: "Removing user"
-#    to_join_ask: "To join a class, ask your teacher for an unlock code."
-#    join_this_class: "Join Class"
-#    enter_here: "<enter unlock code here>"
+    keep_student: "Conserver l'Elève"
+    removing_user: "Suppression de l'utilisateur"
+    to_join_ask: "Pour rejoindre une classe, veuillez demander un code de déverouillage à votre professeur."
+    join_this_class: "Rejoindre cette classe"
+    enter_here: "<entrer le code de déverouillage>"
 #    successfully_joined: "Successfully joined"
-#    click_to_start: "Click here to start taking"
-#    my_courses: "My Courses"
-#    classroom: "Classroom"
-#    use_school_email: "use your school email if you have one"
-#    unique_name: "a unique name no one has chosen"
-#    pick_something: "pick something you can remember"
-#    class_code: "Class Code"
-#    optional_ask: "optional - ask your teacher to give you one!"
-#    optional_school: "optional - what school do you go to?"
-#    start_playing: "Start Playing"
-#    skip_this: "Skip this, I'll create an account later!"
-#    welcome: "Welcome"
-#    getting_started: "Getting Started with Courses"
-#    download_getting_started: "Download Getting Started Guide [PDF]"
-#    getting_started_1: "Create a new class by clicking the green 'Create New Class' button below."
-#    getting_started_2: "Once you've created a class, click the blue 'Add Students' button."
-#    getting_started_3: "You'll see student's progress below as they sign up and join your class."
-#    additional_resources: "Additional Resources"
-#    additional_resources_1_pref: "Download/print our"
-#    additional_resources_1_mid: "Course 1 Teacher's Guide"
-#    additional_resources_1_suff: "explanations and solutions to each level."
-#    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
-#    additional_resources_3_pref: "Visit our"
-#    additional_resources_3_mid: "Teacher Forums"
-#    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
-#    your_classes: "Your Classes"
-#    no_classes: "No classes yet!"
-#    create_new_class1: "create new class"
-#    available_courses: "Available Courses"
+    click_to_start: "Cliquer ici pour démarrer"
+    my_courses: "Mes Cours"
+    classroom: "Classe"
+    use_school_email: "utilisez votre email scolaire si vous en avez un"
+    unique_name: "un nom unique que personne n'a choisi"
+    pick_something: "choisissez quelque chose dont vous pourrez vous souvenir"
+    class_code: "Code de la Classe"
+    optional_ask: "facultatif - demandez à votre professeur de vous en donner un!"
+    optional_school: "facultatif - à quelle école allez-vous?"
+    start_playing: "Commencer à Jouer"
+    skip_this: "Ignorer cette étape, je créSkip this, I'll create an account later!"
+    welcome: "Bienvenu"
+    getting_started: "Démarrer les cours"
+    download_getting_started: "Télécharger le guide de démarrage [PDF]"
+    getting_started_1: "Créez une nouvelle classe en cliquant sur le bouton vert ci-dessous 'Créer une Nouvelle Classe'."
+    getting_started_2: "Une fois que vous avez créé une classe, cliquez sur le bouton bleu 'Ajouter des élèves'."
+    getting_started_3: "Vous verrez la progression des élèves ci-dessous au fur et à mesure qu'ils rejoignent la classe."
+    additional_resources: "Ressources Supplémentaires"
+    additional_resources_1_pref: "Téléchargez/imprimez notre"
+    additional_resources_1_mid: "Guide Professeur du Premier Cours"
+    additional_resources_1_suff: "explications et solutions pour chaque niveaux."
+    additional_resources_2_pref: "Complétez notre"
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+    additional_resources_3_pref: "Visitez notre"
+    additional_resources_3_mid: "Forum des Professeurs"
+    additional_resources_3_suff: "pour être mis en relations avec vos confrères qui utilisent CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+    additional_resources_4_mid: "Page des Ecoles"
+    additional_resources_4_suff: "pour en apprendre plus sur les offres CodeCombat à destination des classes."
+    your_classes: "Vos Classes"
+    no_classes: "Aucune classe pour le moment!"
+    create_new_class1: "créer une nouvelle classe"
+    available_courses: "Cours Disponibles"
 #    unused_enrollments: "Unused enrollments available:"
 #    students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses."
-#    active_courses: "active courses"
-#    no_students: "No students yet!"
-#    add_students1: "add students"
-#    view_edit: "view/edit"
+    active_courses: "cours actifs"
+    no_students: "Aucun élève pour le moment!"
+    add_students1: "ajouter des élèves"
+    view_edit: "voir/modifier"
 #    students_enrolled: "students enrolled"
-#    length: "Length:"
+    length: "Durée:"
 
   classes:
     archmage_title: "Archimage"
@@ -1131,8 +1049,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     indoor: "Intérieur"
     desert: "Desert"
     grassy: "Herbeux"
-#    mountain: "Mountain"
-#    glacier: "Glacier"
+    mountain: "Montagne"
+    glacier: "Glacier"
     small: "Petit"
     large: "Large"
     fork_title: "Fork une nouvelle version"
@@ -1155,7 +1073,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     level_tab_thangs_all: "Tout"
     level_tab_thangs_conditions: "Conditions de départ"
     level_tab_thangs_add: "Ajouter des Thangs"
-#    level_tab_thangs_search: "Search thangs"
+    level_tab_thangs_search: "Rechercher des Thangs"
     add_components: "Ajouter des composants"
     component_configs: "Configuration des composants"
     config_thang: "Double-cliquez pour configurer un Thang"
@@ -1201,7 +1119,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     pop_i18n: "Renseigner I18N"
     tasks: "Tâches"
     clear_storage: "Vider vos changements locaux"
-#    add_system_title: "Add Systems to Level"
+    add_system_title: "Ajouter des sysèmes au niveau"
     done_adding: "Fait Ajouter"
 
   article:
@@ -1288,7 +1206,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     simulate_games: "Simuler une partie !"
     games_simulated_by: "Parties que vous avez simulées :"
     games_simulated_for: "Parties simulées pour vous :"
-#    games_in_queue: "Games currently in the queue:"
+    games_in_queue: "Parties actuellement en attente :"
     games_simulated: "Partie simulée"
     games_played: "Parties jouées"
     ratio: "Moyenne"
@@ -1325,7 +1243,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     fight: "Combattez !"
     watch_victory: "Regardez votre victoire"
     defeat_the: "Vaincre le"
-#    watch_battle: "Watch the battle"
+    watch_battle: "Regarder le combat"
     tournament_started: ", a démarré"
     tournament_ends: "Fin du tournoi"
     tournament_ended: "Tournoi terminé"
@@ -1337,10 +1255,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tournament_blurb_blog: "Sur notre blog"
     rules: "Règles"
     winners: "Gagnants"
-#    league: "League"
+    league: "Ligue"
     red_ai: "Rouge IA" # "Red AI Wins", at end of multiplayer match playback
     blue_ai: "Bleue AI" # {change}
-#    wins: "Wins" # At end of multiplayer match playback
+    wins: "Victoires" # At end of multiplayer match playback
     humans: "Rouge" # Ladder page display team name
     ogres: "Bleue"
 
@@ -1374,9 +1292,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 
   account:
     payments: "Paiements"
-#    prepaid_codes: "Prepaid Codes"
+    prepaid_codes: "Codes prépayés"
     purchased: "Acheté"
-#    sale: "Sale"
     subscription: "Souscrit"
     invoices: "Factures"
     service_apple: "Apple"
@@ -1491,16 +1408,16 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     campaigns: "Campagnes"
     poll: "Sondage"
     user_polls_record: "Historique de sondage des utilisateurs"
-#    course: "Course"
-#    courses: "Courses"
+    course: "Cours"
+    courses: "Cours"
 #    course_instance: "Course Instance"
 #    course_instances: "Course Instances"
-#    classroom: "Classroom"
-#    classrooms: "Classrooms"
-#    clan: "Clan"
-#    clans: "Clans"
-#    members: "Members"
-#    users: "Users"
+    classroom: "Classe"
+    classrooms: "Classes"
+    clan: "Clan"
+    clans: "Clans"
+    members: "Membres"
+    users: "Utilisateurs"
 
   concepts:
     advanced_strings: "Chaînes de caractères avancés"
@@ -1512,15 +1429,15 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     boolean_logic: "Logique Booléenne"
     break_statements: "Déclarations de sortie"
     classes: "Classes"
-#    continue_statements: "Continue Statements"
-    for_loops: "Bloucles Pour"
+    continue_statements: "Instructions Continuer"
+    for_loops: "Boucles Pour"
     functions: "Fonctions"
-#    graphics: "Graphics"
+    graphics: "Graphiques"
     if_statements: "Déclarations conditionnelles Si"
     input_handling: "Manipulation des entrées"
     math_operations: "Opérations mathématiques"
     object_literals: "Objets littéraux"
-#    parameters: "Parameters"
+    parameters: "Paramètres"
     strings: "Chaînes de caractères"
     variables: "Variables"
     vectors: "Vecteurs"
@@ -1530,7 +1447,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
   delta:
     added: "Ajouté"
     modified: "Modifié"
-#    not_modified: "Not Modified"
+    not_modified: "Non modifié"
     deleted: "Supprimé"
     moved_index: "Index changé"
     text_diff: "Différence de texte"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     email_settings_url: "vos paramètres d'e-mail "
     email_description_suffix: "ou avec des liens disponibles dans nos e-mails, vous pouvez changer vos préférences ou vous désinscrire à tout moment."
     cost_title: "Coût"
-    cost_description: "Pour l'instant, CodeCombat est gratuit à 100% ! Un de nos principaux objectifs est que ça le reste, pour qu'autant de gens possible puissent y jouer, indépendamment de leur niveau de vie. Si le ciel s'assombrit, nous devrons peut-être rendre les inscriptions payantes ou une partie du contenu, mais nous ne le souhaitons pas. Avec un peu de chance, nous serons capables de soutenir l'entreprise avec :"
+    cost_description_a: "CodeCombat est gratuit sur tous ses niveaux principaux, avec un abonnement de {{price}}$/mois pour l'accès à de nouveaux niveaux et {{gems}} gemmes bonus par mois. Vous pouvez annuler en un clic, et nous vous garantissons un remboursement intégral."
     copyrights_title: "Copyrights et Licences"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Toute contribution, sur le site et sur le répertoire GitHub, est sujette à nos"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     nutshell_title: "En un mot"
     nutshell_description: "Chaque ressource que nous fournissons dans l'éditeur de niveau est libre d'utilisation pour créer des niveaux. Mais nous nous réservons le droit de restreindre la distribution des niveaux créés (qui sont créés sur codecombat.com) ils peuvent donc devenir payants dans le futur, si c'est ce qui doit arriver."
     canonical: "La version de ce document est la version définitive et canonique. En cas d'irrégularité dans les traductions, le document anglais fait foi."
+    third_party_title: "Services tiers"
+    third_party_description: "CodeCombat utilise les services tiers suivants, entre autres :"
 
   ladder_prizes:
     title: "Prix du tournoi" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     license: "Licence"
     oreilly: "ebook de votre choix"
 
-  account_profile:
-    settings: "Paramètres" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Editer Profil"
-    done_editing: "Modifications effectuées"
-    profile_for_prefix: "Profil pour "
-    profile_for_suffix: ""
-    featured: "Complet"
-    not_featured: "Incomplet"
-    looking_for: "à la recherche de:"
-    last_updated: "Dernière mise à jour:"
-    contact: "Contact"
-    active: "En recherche d'offres"
-    inactive: "Ne recherche pas d'offres"
-    complete: "Terminé"
-    next: "Suivant"
-    next_city: "Ville ?"
-    next_country: "Choisissez votre pays."
-    next_name: "Nom ?"
-    next_short_description: "Résumez votre profil en quelques mots."
-    next_long_description: "Décrivez le travail que vous cherchez."
-    next_skills: "listez au moins 5 compétances."
-    next_work: "décrivez votre expérience professionnelle."
-    next_education: "raconter votre scolarité."
-    next_projects: "décrivez jusqu'à 3 projets sur lesquels vous avez travaillé."
-    next_links: "ajouter des liens internet vers des sites personnels ou des réseaux sociaux."
-    next_photo: "ajouter une photo professionelle (optionnel)."
-    next_active: "déclarez vous ouvert aux offres pour apparaitre dans les recherches."
-    example_blog: "Votre blog"
-    example_personal_site: "Site Web"
-    links_header: "Liens personnels"
-    links_blurb: "Lien vers d'autres sites ou profils que vous souhaitez mettre en avant, comme votre GitHub, LinkedIn ou votre blog."
-    links_name: "Nom du lien"
-    links_name_help: "A quoi êtes vous lié ?"
-    links_link_blurb: "Lien URL"
-    basics_header: "Mettre à jour les information basiques"
-    basics_active: "Ouvert aux propositions"
-    basics_active_help: "Voulez-vous des offres maintenant ?"
-    basics_job_title: "Titre du poste souhaité"
-    basics_job_title_help: "Quel est le rôle que vous cherchez ?"
-    basics_city: "Ville"
-    basics_city_help: "Ville dans laquelle vous souhaitez travailler (ou dans laquelle vous vivez actuellement)."
-    basics_country: "Pays"
-    basics_country_help: "Pays dans lequel vous souhaitez travailler (ou dans lequel vous vivez actuellement)."
-    basics_visa: "Statut de travail aux Etats-Unis"
-    basics_visa_help: "Etes vous autorisé à travailler aux Etats-Unis ou avez vous besoin d'un parrainage pour le visa ?"
-    basics_looking_for: "Recherche"
-    basics_looking_for_full_time: "Temps plein"
-    basics_looking_for_part_time: "Temps partiel"
-    basics_looking_for_remote: "A distance"
-    basics_looking_for_contracting: "Contrat"
-    basics_looking_for_internship: "Stage"
-    basics_looking_for_help: "Quel genre de poste de développeur voulez-vous ?"
-    name_header: "Remplissez votre nom"
-    name_anonymous: "Developpeur Anonyme"
-    name_help: "Le nom que vous souhaitez que l'employeur voie, par exemple 'Chuck Norris'."
-    short_description_header: "Décrivez vous en quelques mots"
-    short_description_blurb: "Ajoutez une phrase d'accroche pour permettre à un employeur d'en savoir plus sur vous."
-    short_description: "Description courte"
-    short_description_help: "Qui êtes vous et que recherchez vous ? 140 caractères max."
-    skills_header: "Compétences"
-    skills_help: "Notez vos compétence de développement par ordre de maitrise."
-    long_description_header: "Détaillez votre poste souhaité"
-    long_description_blurb: "Faites savoir aux employeurs combien vous êtes génial et quel poste vous voulez."
-    long_description: "Biographie"
-    long_description_help: "Décrivez-vous aux potentiels employeurs. Soyez bref et direct. Nous vous recommandons de bien indiquer quel poste vous intéresse le plus. 600 caractères max."
-    work_experience: "Experience de travail"
-    work_header: "Présentez votre parcours professionnel"
-    work_years: "Années d'expérience"
-    work_years_help: "Combien d'années d'expérience professionnelle (salarié) avez-vous dans le développement logiciel ?"
-    work_blurb: "Lister vos missions les plus pertinentes, les plus récentes en premier."
-    work_employer: "Employeur"
-    work_employer_help: "Nom de votre employeur."
-    work_role: "Titre du poste"
-    work_role_help: "Quel était l'intitulé de votre mission ou votre poste ?"
-    work_duration: "Durée"
-    work_duration_help: "Quand avez-vous tenu ce concert"
-    work_description: "Description"
-    work_description_help: "Qu'est-ce que vous y avez fait ? (140 carac.; optionel)"
-    education: "Education"
-    education_header: "Racontez vos exploits scolaires"
-    education_blurb: "Lister vos exploits scolaires."
-    education_school: "Etablissement"
-    education_school_help: "Nom de l'établissement."
-    education_degree: "Diplôme"
-    education_degree_help: "Quel était votre diplôme et votre domaine d'étude ?"
-    education_duration: "Dates"
-    education_duration_help: "Quand ?"
-    education_description: "Description"
-    education_description_help: "Mettez en avant ce que vous voulez à propos de votre parcours scolaire. (140 carac.; optionel)"
-    our_notes: "Notes"
-    remarks: "Remarques"
-    projects: "Projets"
-    projects_header: "Ajoutez 3 projets"
-    projects_header_2: "Projets (Top 3)"
-    projects_blurb: "Mettez en avant vos projets pour épater les employeurs."
-    project_name: "Nom du projet"
-    project_name_help: "Comment avez-vous appelé votre projet ?"
-    project_description: "Description"
-    project_description_help: "Décrivez brièvement le projet."
-    project_picture: "Image"
-    project_picture_help: "Chargez une image de 230x115px oou plus grande pour présenter votre projet."
-    project_link: "Lien"
-    project_link_help: "Lien vers le projet."
-    player_code: "Code Joueur"
-
-  employers:
-    deprecation_warning_title: "Désolé, CodeCombat ne recrute pas en ce moment."
-    deprecation_warning: "Nous nous concentrons sur les niveaux pour débutants au lieu de trouver des développeurs experts pour le moment."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Commencer"
-    already_screened: "Nous avons déjà examiné techniquement tous les candidats"
-    filter_further: ", mais vous pouvez filtrer davantage:"
-    filter_visa: "Visa"
-    filter_visa_yes: "US Authorisé"
-    filter_visa_no: "Non autorisé"
-    filter_education_top: "Ecole supérieure"
-    filter_education_other: "Autre"
-    filter_role_web_developer: "Développeur Web"
-    filter_role_software_developer: "Développeur logiciel"
-    filter_role_mobile_developer: "Développeur mobile"
-    filter_experience: "Expérience"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-    filter_experience_student: "Étudiant"
-    filter_results: "Résultats"
-    start_hiring: "Commencer à embaucher."
-    reasons: "Trois raisons pour lesquelles vous devriez employer vos prochains employés avec nous."
-    everyone_looking: "Toutes les personnes ici sont en quête de leur nouvel emploi."
-    everyone_looking_blurb: "Oubliez environ 20% du taux de réponse de courriels Linkedin. Toutes les personnes que nous avons listé sur ce site veulent être trouvé pour un nouvel emploi et répondront à votre requête pour qu'ils puissent s'introduire."
-    weeding: "Soyez tranquille, nous avons effectué une première sélection pour vous."
-    weeding_blurb: "Tous les joueurs que nous avons listés ont été sélectionné pour leurs abilités techniques. Nous allons également effectuer des entrevues techniques au téléphone pour sélectionner les candidats et ajouter des notes à leurs profiles afin de vous sauver du temps."
-    pass_screen: "Ils vont passer votre section technique"
-    pass_screen_blurb: "Réviser le code de chaque candidat avant de l'envoyer aux employeurs. Un employeur trouve que 5 fois plus de nos développeurs passent leur section technique que ceux en provenance de Hacker News."
-    make_hiring_easier: "Faire de mon embauche plus facile, s'il vous plaît."
-    what: "Qu'est-ce que CodeCombat?"
-    what_blurb: "CodeCombat est un jeu de programmation multijoueur par navigateur. Les Joueurs écrivent le code pour contrôler leurs troupes dans des batailles contre d'autres développeurs. Nous prenons en charge JavaScript, Python, Lua, Clojure, CoffeeScript, et Io."
-    cost: "Combien chargeons-nous ?"
-    cost_blurb: "Nous chargeons 15% sur la première année de salaire et offrons une garantie de 100% d'argent remis sur une période de 90 jours. Nous ne chargerons pas les candidats qui activement en train d'être interviewer dans votre compagnie."
-    candidate_name: "Nom"
-    candidate_location: "Localisation"
-    candidate_looking_for: "Poste pour"
-    candidate_role: "Rôle"
-    candidate_top_skills: "Talents/Aptitudes"
-    candidate_years_experience: "Années d'expérience"
-    candidate_last_updated: "Dernière mise à jour"
-    candidate_who: "Qui"
-    featured_developers: "Nouveaux développeurs"
-    other_developers: "Autres développeurs"
-    inactive_developers: "Développeurs inactifs"
-
   admin:
     av_espionage: "Espionnage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "E-mail ou nom d'utilisateur"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     av_entities_sub_title: "Entités"
     av_entities_users_url: "Utilisateurs"
     av_entities_active_instances_url: "Instances actives"
-    av_entities_employer_list_url: "Liste des employés"
-    av_entities_candidates_list_url: "Liste des candidats"
     av_entities_user_code_problems_list_url: "Liste des problèmes du code d'utilisateur"
     av_other_sub_title: "Autre"
     av_other_debug_base_url: "Base (pour debugger base.jade)"
diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee
index a58ace1ff..b0bd20e8e 100644
--- a/app/locale/gl.coffee
+++ b/app/locale/gl.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     multiplayer: "Multixogador" # Not currently shown on home page
     for_developers: "Para programadores" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Xogar" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     creating: "Creando conta..."
     sign_up: "Rexistrarse"
     log_in: "Iniciar sesión con contrasinal"
-    social_signup: "Ou, podes acceder a través da túa conta de Facebook ou G+:"
     required: "Tes que estar rexistrado antes de poder continuar."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     incomplete: "Incompleto"
     timed_out: "Acabouse o tempo"
     failing: "Fallando"
-    action_timeline: "Cronoloxía de Acción"
-    click_to_select: "Preme nunha unidade para seleccionala"
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Envía o teu comentario"
-    contact_candidate: "Contactar Candidato" # Deprecated
-    recruitment_reminder: "Usa este formulario para contactar cos candidatos que queiras entrevistar. Recorda que CodeCombat cobrará o 18% do salario durante o primeiro ano. A cuota é pola contratación do empregado e é reembolsable durante 90 días se o empregado non permanece contratado. A tempo parcial, a distancia e os empregados de contrato son gratis, como o son os bolseiros." # Deprecated
 
   account_settings:
     title: "Axustes da conta"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     saved: "Cambios gardados"
     password_mismatch: "O contrasinal non coincide"
     password_repeat: "Repite o teu contrasinal."
-    job_profile: "Perfil de traballo" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "O teu perfil de traballo foi aprobado por CodeCombat. Os empleadores poderán velo ata que o marques como inactivo ou non sexa cambiado durante catro semanas."
-    job_profile_explanation: "Ola! Enche isto e estaremos en contacto para falar sobre atoparte un traballo como desenvolvedor de software."
-    sample_profile: "Mira un perfil de exemplo"
-    view_profile: "Mira o teu perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Atallos de teclado"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     email_settings_url: "os teus axustes de correo electrónico"
     email_description_suffix: "ou a través das ligazóns nos correos que te enviemos, podes cambiar as túas preferencias e darte de baixa doadamente en calquera momento."
     cost_title: "Prezo"
-    cost_description: "Actualmente, CodeCombat é 100% de balde! Un dos nosos principais obxectivos é mantelo así, de forma que o maior número posible de xente poida xogar, independientemente das súas posibilidades económicas. Se as cousas van mal, se cadra teremos que cobrar suscripcións por algún contido, pero preferimos non facelo. Cun pouco de sorte, poderemos manter a empresa con: "
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights e Licenzas"
     contributor_title: "Acordo de Licenza do Colaborador"
     contributor_description_prefix: "Todas as colaboracións, tanto na web como no noso repositorio de GitHub, están suxeitas ao noso"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     nutshell_title: "Nunha palabra"
     nutshell_description: "Todos os recursos que ofrecemos no editor de niveis son libres de ser utilizados para crear niveis. Pero reservámosnos o dereito de restrinxir a distribución dos propios niveis (que se crean en codecombat.com) de modo que se poida cobrar por eles no futuro, se iso é o que termina por suceder."
     canonical: "A versión inglesa deste documento é a canónica, a definitiva. Se hai algunha diferenza coa que poida aparecer nas traduccións, a versión inglesa é a que prevalece sobre as demais."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premios do Torneo" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     license: "licenza"
     oreilly: "ebook da túa escolla"
 
-  account_profile:
-    settings: "Configuración" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Editar Perfil"
-    done_editing: "Edición Terminada"
-    profile_for_prefix: "Perfil de "
-    profile_for_suffix: ""
-    featured: "Destacado"
-    not_featured: "Sen Destacar"
-    looking_for: "Buscando:"
-    last_updated: "Última actualización:"
-    contact: "Contacto"
-    active: "Buscando entrevistas de traballo"
-    inactive: "Non busco entrevistas de traballo agora mesmo"
-    complete: "Completado"
-    next: "Seguinte"
-    next_city: "Cidade?"
-    next_country: "escolle o teu país."
-    next_name: "Nome?"
-    next_short_description: "escribe unha descripción breve."
-    next_long_description: "describe o teu posto de traballo desexado."
-    next_skills: "Pon ao menos cinco habilidades."
-    next_work: "Resume a túa historia laboral."
-#    next_education: "recount your educational ordeals."
-    next_projects: "Amósanos tres proxectos nos que teñas traballado."
-    next_links: "Engade ligazóns personais ou de redes sociais."
-    next_photo: "Engadir unha foto para o perfil profesional."
-    next_active: "Amosarte aberto a ofertas nas búsquedas."
-    example_blog: "Blog"
-    example_personal_site: "Web personal"
-    links_header: "Ligazóns Personais"
-    links_blurb: "Liga a outros sitios ou perfiles que queiras destacar como o teu GitHub, LinkedIn, ou o teu blog."
-    links_name: "Nome da ligazón"
-    links_name_help: "Que estás ligando?"
-    links_link_blurb: "URL da ligazón"
-    basics_header: "Actualizar información básica"
-    basics_active: "Aberto a ofertas"
-    basics_active_help: "Buscas entrevistas de traballo agora?"
-#    basics_job_title: "Desired Job Title"
-    basics_job_title_help: "Que tipo de rol estás buscando?"
-    basics_city: "Cidade"
-    basics_city_help: "Cidade na que queres traballar (ou na que vives actualmente)."
-    basics_country: "País"
-    basics_country_help: "País no que queres traballar (ou no que vives actualmente)."
-    basics_visa: "Status de Traballo en EEUU"
-    basics_visa_help: "Estás autorizado a traballar en EEUU, ou precisas unha visa patrocinada? (Se vives en Canadá ou Australia, marca autorizado.)"
-    basics_looking_for: "Estou Buscando"
-    basics_looking_for_full_time: "Full-time (tempo completo)"
-    basics_looking_for_part_time: "Tempo Parcial"
-    basics_looking_for_remote: "Dende a Casa"
-    basics_looking_for_contracting: "Contractual"
-    basics_looking_for_internship: "Interino"
-    basics_looking_for_help: "Que tipo de posto de desenvolemento te gustaría?"
-    name_header: "Escribe o teu nome"
-    name_anonymous: "Desenvolvedor Anónimo"
-    name_help: "Esto é o que queres que vexan as empresas, algo como 'Nick Winter'."
-    short_description_header: "Escribe unha breve descripción sobre ti."
-    short_description_blurb: "Engade unha frase que lles axude ás empresas a facerse unha idea de ti."
-#    short_description: "Tagline"
-    short_description_help: "Quen es, e que estás buscando? 140 caracteres como máximo."
-    skills_header: "Habilidades"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-    long_description_header: "Descríbenos o teu traballo soñado"
-    long_description_blurb: "Conta aos teus empregadores o impresionante que es e que traballo estás buscando."
-    long_description: "Descripción Persoal"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Experiencia laboral"
-    work_header: "Cóntanos un pouco a túa historial laboral"
-    work_years: "Anos de experiencia"
-    work_years_help: "Cantos anos tes de experiencia profesional (remunerada) como desenvolvedor de sofware?"
-    work_blurb: "Fai un listado coa experiencia laboral relevante, o máis recente primeiro."
-    work_employer: "Empresa/Empregador"
-    work_employer_help: "Nome da empresa / empregador."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-    work_duration: "Duración"
-#    work_duration_help: "When did you hold this gig?"
-    work_description: "Descripción"
-    work_description_help: "Que fixeches alí? (140 caracteres máximo; opcional)"
-    education: "Educación"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "Universidade"
-    education_school_help: "Nome da Universidade."
-    education_degree: "Titulo"
-    education_degree_help: "Cal era a túa carreira e o teu campo de estudo?"
-    education_duration: "Duración"
-    education_duration_help: "Cando?"
-    education_description: "Descripción"
-    education_description_help: "Resalta algo da túa experiencia educativa. (140 caracteres maximo; opcional)"
-    our_notes: "As nosas notas"
-#    remarks: "Remarks"
-    projects: "Proxectos"
-    projects_header: "Engade 3 proxectos"
-    projects_header_2: "Proyectos (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-    project_name: "Nome do proxecto"
-    project_name_help: "Como se chamaba o proxecto?"
-    project_description: "Descripción"
-    project_description_help: "Describe o proxecto brevemente."
-    project_picture: "Foto"
-    project_picture_help: "Sube unha imaxe de 230x115 px ou máis grande ensinándonos o proxecto."
-    project_link: "Ligazón"
-    project_link_help: "Ligazón ao proxecto."
-    player_code: "Código de Xogador"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Contrata desenvolvedores, non credenciais." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Comezar"
-#    already_screened: "We've already technically screened all our candidates"
-    filter_further: ", Pero podes filtrar máis alá:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizado en EEUU"
-    filter_visa_no: "Non Autorizado"
-#    filter_education_top: "Top School"
-    filter_education_other: "Outros"
-    filter_role_web_developer: "Desenvolvedor Web"
-    filter_role_software_developer: "Desenvolvedor de Software"
-    filter_role_mobile_developer: "Desenvolvedor de Móbiles"
-    filter_experience: "Experiencia"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Recén Graduado"
-    filter_experience_student: "Estudante Universitario"
-    filter_results: "notas"
-    start_hiring: "Comenzar a contratar."
-    reasons: "Tres razóns polas que deberías contratar a través de nos:"
-    everyone_looking: "Todo o mundo aquí está buscando a súa proxima oportunidade."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-    weeding: "Séntate; nós fixemos o traballo por ti."
-    weeding_blurb: "Todos os xogadores que poñemos na lista foron seguidos polas súas habilidades técnicas. Tamén facemos chamadas de teléfono para os candidatos seleccionados e anotamos nos seus perfís para aforrar tempo."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-    make_hiring_easier: "Facer a miña contratación máis doada, por favor."
-    what: "Que é CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-    cost: "Canto cobramos?"
-    cost_blurb: "Cobramos o 15% do salario do primeiro ano e ofrecemos reembolso do 100% do diñeiro durante 90 días. Non cobramos aos candidatos que xa están sendo entrevistados na túa compañia."
-    candidate_name: "Nome"
-    candidate_location: "Ubicación"
-    candidate_looking_for: "Buscando"
-    candidate_role: "Rol"
-    candidate_top_skills: "Mellores Habilidades"
-    candidate_years_experience: "Anos Experiencia"
-    candidate_last_updated: "Última actualización"
-    candidate_who: "Quen"
-    featured_developers: "Desenvolvedores Destacados"
-    other_developers: "Outros Desenvolvedores"
-    inactive_developers: "Desenvolvedores Inactivos"
-
   admin:
     av_espionage: "Espionaxe" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Correo electrónico ou Nome de usuario"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Usuarios"
     av_entities_active_instances_url: "Instancias Activas"
-    av_entities_employer_list_url: "Lista de empregados"
-    av_entities_candidates_list_url: "Lista de candidatos"
     av_entities_user_code_problems_list_url: "Lista de Problemas de Código do Usuario"
     av_other_sub_title: "Outros"
     av_other_debug_base_url: "Base (para debugging base.jade)"
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index bad4e2b25..a825925b1 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     multiplayer: "רב-משתתפים" # Not currently shown on home page
     for_developers: "למפתחים" # Not currently shown on home page.
     or_ipad: "iPadאו הורד ל"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "שלבים" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     creating: "יוצר חשבון..."
     sign_up: "הירשם"
     log_in: "כנס עם סיסמה"
-    social_signup: "Facebook ו Google+ או, שאתה יכול להירשם דרך"
     required: ".יש להתחבר על מנת לגשת לשלב זה"
     login_switch: "? כבר יש לך משתמש"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     incomplete: "לא הושלם"
     timed_out: "הזמן אזל"
     failing: "נכשל"
-    action_timeline: "ציר זמן"
-    click_to_select: ".לחץ על יחידה על מנת לבחור בה"
     control_bar_multiplayer: "רב-משתתפים"
     control_bar_join_game: "הצטרף למשחק"
     reload: "טען שוב"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     parents_title: "ילדכם ילמד לתכנת." # {change}
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "מנוי חודשי"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "יש צורך במנוי כדי לשחק בשלב זה."
     unlock_help_videos: "רכוש מנוי כדי לפתוח את כל הדרכות הוידאו."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     screenshot_included: ".כולל תמונות"
     where_reply: "?איפה אנחנו אמורים להגיב"
     send: "שלח מייל"
-    contact_candidate: "צור קשר עם נציג" # Deprecated
-    recruitment_reminder: "השתמש בטופס זה כדי להגיע למועמדים שאתה מעוניין לראיין. זכור כי CodeCombat גובה 15% מהשכר בשנה הראשונה.התשלום מתבצע בעת שכירת העובדים ויוחזר במשך 90 ימים אם העובד לא יישאר מועסק. משרה חלקית, עובדים מרוחקים, עובדי חוזה הם חינם, כמו גם מתמחה." # Deprecated
 
   account_settings:
     title: "הגדרות חשבון"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     saved: "השינויים נשמרו"
     password_mismatch: "סיסמאות לא זהות"
     password_repeat: ".אנא חזור על הסיסמא"
-    job_profile: "פרופיל עבודה" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "פרופיל העבודה שלך אושר על ידי CodeCombat. מעסיקים יוכלו לראות את הפרופיל עד שאתה או מסמן אותו כ 'לא פעיל' או אם הוא לא השתנה במשך ארבעה שבועות."
-    job_profile_explanation: "היי! מלא את זה, ואנו ניצור איתך קשר על מציאת עבודה כמפתח תוכנה."
-    sample_profile: "פרופיל לדוגמה"
-    view_profile: "צפה בפרופיל שלך"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "קיצורי מקשים"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     subs_only: "מנויים בלבד"
     create_clan: "צור שבט חדש"
     private_preview: "צפה"
+#    private_clans: "Private Clans"
     public_clans: "שבטים פתוחים"
     my_clans: "השבטים שלי"
     clan_name: "שם השבט"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     payments: "תשלומים"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "קניות"
-#    sale: "Sale"
     subscription: "מנויים"
 #    invoices: "Invoices"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "הגדרות" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "ערוך פרופיל"
-    done_editing: "סיים עריכה"
-    profile_for_prefix: "פרופיל ל"
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: ":מחפש"
-    last_updated: "עודכן לאחרונה ב:"
-    contact: "צור קשר"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-    next: "הבא"
-    next_city: "עיר?"
-    next_country: "בחר את המדינה שלך."
-    next_name: "שם?"
-    next_short_description: "כתוב תיאור קצר."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
     av_espionage: "ריגול" # Really not important to translate /admin controls.
     av_espionage_placeholder: "כתובת מייל או שם משתמש"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    av_entities_sub_title: "Entities"
     av_entities_users_url: "משתמשים"
 #    av_entities_active_instances_url: "Active Instances"
-    av_entities_employer_list_url: "רשימת מעסיק"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "אחר"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index fc825250b..4f3b10258 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
     multiplayer: "मल्टीप्लेयर" # Not currently shown on home page
     for_developers: "डेवलपर्स के लिए" # Not currently shown on home page.
     or_ipad: "या iPad के लिए डाउनलोड करें"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "चरण" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index d8c0ad30d..1d4446a9c 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     multiplayer: "Többjátékos" # Not currently shown on home page
     for_developers: "Fejlesztőknek" # Not currently shown on home page.
     or_ipad: "Vagy töltsd le iPadra"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Játék" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     creating: "Fiók létrehozása"
     sign_up: "Regisztráció"
     log_in: "Belépés meglévő fiókkal"
-    social_signup: "De regisztrálhatsz a Facebook-on vagy a G+:-on keresztül is."
     required: "Csak akkor mehetsz arra, ha már bejelentkeztél."
     login_switch: "Már van fiókod?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     incomplete: "Hiányos"
     timed_out: "Kifutottál az időből"
     failing: "Bukás"
-    action_timeline: "Akció - Idővonal"
-    click_to_select: "Kattints egy egységre, hogy kijelöld!"
     control_bar_multiplayer: "Többjátékos"
     control_bar_join_game: "Csatlakozz"
     reload: "Újratöltés"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     parents_title: "A gyereke programozni tanul majd." # {change}
     parents_blurb1: "A CodeCombattal a gyereke valódi programozási feladatokon keresztül tanul. Egyszerű utasításokkal kezdenek, aztán további témákba is betekintést kapnak."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "Havonta 9,99 USD-ért, minden héten új kihívások elé állítjuk őket és személyre szóló emailes támogatást nyújtanak enkik profi programozók." # {change}
+    parents_blurb2: "Havonta {{price}} USD-ért, minden héten új kihívások elé állítjuk őket és személyre szóló emailes támogatást nyújtanak enkik profi programozók." # {change}
     parents_blurb3: "100%-os pénzvisszafizetés garancia: 1-kattintásossal leiratkozhat."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Havi előfizetés"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Ehhez a szinthez elő kell fizetnek."
     unlock_help_videos: "Végy előfizetést, hogy feloldd az összes videó oktatóanyagot."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Információ Tanároknak"
-    intro_1: "CodeCombat egy online játék, amelyik programozni tanít. A tanulók valódi programnyelven kódolnak."
-    intro_2: "Előzetes tapasztalat nem szükséges!"
-    free_title: "Mennyibe kerül?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "CodeCombat Basic INGYENES! 70-nél is több pálya, amely minden tudást megad." # {change}
-    free_2: "A havidíjas előfizetés hozzáférést biztosít az oktató videókhoz és az extra gyakoroló pályákhoz."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Tanárok ingyenes előfizetést kapnak!" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Lépjen kapcsolatba velünk," # {change}
-    teacher_subs_2: "hogy megkapja az ingyenes havi előfizetést." # {change}
-#    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "Mit tartalmaz az előfizetés?"
-    sub_includes_1: "A 80+ alap pályán kívül az előfizetéssel rendelkező tanulók az alábbi extrákhoz férnek hozzá:" # {change}
-    sub_includes_2: "50+ gyakorló pálya" # {change}
-    sub_includes_3: "Oktató videók"
-    sub_includes_4: "Prémium támogatás emailen"
-    sub_includes_5: "7 új hős egyedi képességekkel" # {change}
-    sub_includes_6: "3500 bónusz drágakő minden hónapban"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
     who_for_title: "Kinek való a CodeCombat?"
-    who_for_1: "A CodeCombat-ot 9 évesnél idősebb tanulóknak ajánljuk. Semmilyen programozási előismeret vagy tapasztalat nem szükséges."
-    who_for_2: "Úgy terveztük meg a CodeCombat-ot, hogy fiúk és lányok számára is élvezetes legyen."
-    material_title: "Mennyi anyagot tartalmaz?"
-    material_premium_server: "Körülbelül 22 órányi játékidő a 120+ előfizetőknek járó pályákon, minden héten további 5 új pályával." # {change}
-    material_1: "Körülbelül 8 órányi ingyenes tartalom kiegészítve 14 órányi előfizetőknek járó tartalommal, minden héten további 5 új pályával." # {change}
-#    concepts_title: "What concepts are covered?"
-    how_much_title: "Mennyibe kerül a havi előfizetés?"
-#    how_much_1: "A"
-    how_much_2: "havi előfizetés"
-    how_much_3: "$9.99, ami bármikor lemondható."
-    how_much_4: "Ezen kívül kedvezményeket adunk nagyobb csoportok részére:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+    who_for_1: "A CodeCombat-ot 9 évesnél idősebb tanulóknak ajánljuk. Semmilyen programozási előismeret vagy tapasztalat nem szükséges." # {change}
+    who_for_2: "Úgy terveztük meg a CodeCombat-ot, hogy fiúk és lányok számára is élvezetes legyen." # {change}
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "Rendszer-követelmények"
-    sys_requirements_1: "Egy modern web-böngésző. Újabb verziójú Chrome, Firefox, vagy Safari, illetve Internet Explorer 9 vagy újabb."
-    sys_requirements_2: "CodeCombat még nem támogatott iPad-en."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     screenshot_included: "Képernyőkép (screenshot) mellékelve."
     where_reply: "Milyen címre válaszoljunk?"
     send: "Visszajelzés küldése"
-    contact_candidate: "Vedd fel a kapcsolatot a jelölttel" # Deprecated
-    recruitment_reminder: "Használd ezt az űrlapot, hogy tudasd a jelöltekkel, szívesen fogadnád őket egy interjúra. Ne feledd, CodeCombat felszámítja az első évi fizetés 15%-át. A díj a munkavállaló alkalmazásakor esedékes, és 90 napig visszafizetendő, ha a munkavállaó nem marad alkalmazásban. Részidőben, távmunkára és szerződéssel alkalmazottak után nem kell fizetni, valamint gyakornokok után sem." # Deprecated
 
   account_settings:
     title: "Fiók beállítások"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     saved: "Változtatások elmentve"
     password_mismatch: "A jelszavak nem egyeznek."
     password_repeat: "Kérlek ismételd meg a jelszavadat"
-    job_profile: "Munkaköri leírás" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Munkaköri leírásodat a Codecombat jóváhagyta. Munkaadók mindaddig láthatják, amíg meg nem jelölöd inaktívként, vagy négy hétig, ha addig nem kerül megváltoztatásra."
-    job_profile_explanation: "Szió! Töltsd ki ezt és majd kapcsolatba lépünk veled és keresünk neked egy szoftware fejlesztői állást."
-    sample_profile: "Nézz meg egy mintaprofilt!"
-    view_profile: "Nézd meg a profilodat!"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Billentyűparancsok"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     payments: "Befizetések"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Vásárolt"
-#    sale: "Sale"
     subscription: "Előfizetés"
     invoices: "Számlák"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "Beállítások" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Szerkeszd meg a profilodat"
-    done_editing: "Szerkesztés kész"
-    profile_for_prefix: "Profil "
-    profile_for_suffix: " számára"
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "Keres:"
-    last_updated: "Legutóbb napra-készre hozva:"
-    contact: "Kapcsolat"
-    active: "Azonnali interjú ajánlatokat keresek"
-    inactive: "Most éppen nem keresek interjú ajánlatokat"
-    complete: "befejezve"
-    next: "Következő"
-    next_city: "Város?"
-    next_country: "válaszd ki az országot."
-    next_name: "Név?"
-    next_short_description: "adj egy rövid leírást."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-    basics_city: "Város"
-    basics_city_help: "A város, ahol dolgozni akarsz (vagy ahol élsz)"
-    basics_country: "Ország"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-    basics_looking_for_full_time: "Teljes munkaidőben"
-    basics_looking_for_part_time: "Részmunkaidőben"
-    basics_looking_for_remote: "Távmunkában"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-    name_header: "Add meg a neved"
-    name_anonymous: "Névtelen Fejlesztő"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Munkatapasztalat"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Végzettség"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-    projects: "Projektek"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Név"
-#    candidate_location: "Location"
-    candidate_looking_for: "Keres"
-    candidate_role: "Szerep"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-    candidate_last_updated: "Legutóbb napra-készre hozva"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index 22c06eb81..4e9fb5488 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Developers" # Not currently shown on home page.
     or_ipad: "atau download untuk iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index c5d764a93..4a59f0b15 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Per Sviluppatori" # Not currently shown on home page.
     or_ipad: "O scarica per iPad"
-    hoc_class_code: "Possiedo un Class Code"
-    hoc_enter: "Entra"
-    hoc_title: "Hour of Code?"
 
   nav:
     play: "Livelli" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     creating: "Creazione account..."
     sign_up: "Registrati"
     log_in: "Accedi con la password"
-    social_signup: "Oppure puoi registrarti con Facebook o Google+:"
     required: "Effettua l'accesso per proseguire."
     login_switch: "Hai già un account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     incomplete: "Incompleto"
     timed_out: "Tempo scaduto"
     failing: "Fallito"
-    action_timeline: "Barra temporale delle azioni"
-    click_to_select: "Clicca un'unità per selezionarla."
     control_bar_multiplayer: "Multigiocatore"
     control_bar_join_game: "Unisciti al gioco"
     reload: "Ricarica"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     parents_title: "Caro Genitore: Tuo figlio/a sta imparando a programmare. Vuoi continuare ad aiutarlo/a ? "
     parents_blurb1: "Tuo figlio/a ha giocato a _nLevels__ livelli ed ha imparato le basi della programmazione. Aiutalo/a a coltivare i suoi interessi ed acquistagli un’abbonamento così potrà continuare a giocare."
     parents_blurb1a: "La programmazione e' una capacita' che indubbiamente sara' utile a tuo figlio da adulto. Nel 2020 una capacita' basilare di programmazione sara' richiesta dal 77% dei lavori e la richiesta a livello mondiale di ingegneri del software e' in continua crescita. Lo sai che la laurea in Informatica e' la piu' pagata sul mercato?"
-    parents_blurb2: "Per  $9.99 dollari/mese, tuo figlio ricevera' settimanalmente nuove avventure e un supporto personale via email fornito d aprogrammatori professionisti."
+    parents_blurb2: "Per  ${{price}} dollari/mese, tuo figlio ricevera' settimanalmente nuove avventure e un supporto personale via email fornito d aprogrammatori professionisti."
     parents_blurb3: "Nessun rischio: 100% restituzione dei soldi con un semplice processo di deregistrazione"
     payment_methods: "Metodi di Pagamento"
     payment_methods_title: "Metodi di Pagamento Accetati"
     payment_methods_blurb1: "Attualmente accettiamo come metodi di pagamento la carta di credito e Alipay." # {change}
     payment_methods_blurb2: "Se necessiti di un forma di pagamento diverso.Per favore contattaci"
-    sale_already_subscribed: "Sei già abbonato!"
-    sale_blurb1: "Risparmia il  $21" # {change}
-    sale_blurb2: "rispetto all'abbinamento ordinario di 120$ per l'intero anno!"
     sale_button: "Saldi!"
-    sale_button_title: "Risparmi il $21 quando compri l'abbonamento per 1 anno" # {change}
-    sale_click_here: "Clicca qui"
-    sale_ends: "Fine"
-    sale_extended: "*Gli abbonamenti in corso verranno estesi per 1 anno."
-    sale_feature_here: "Qui cio' che otterrai:"
-    sale_feature2: "Accesso a 9 nuovi potenti <strong>eroi</strong> con abilita' uniche!"
-    sale_feature4: "<strong>42,000 gemme premio</strong> riconosciute immediatamente!"
-    sale_continue: "Pronto per continuare l'avventura?"
-    sale_limited_time: "Offerta limitata!"
-    sale_new_heroes: "Nuovi eroi!"
-    sale_title: "Saldi di inizio scuola"
-    sale_view_button: "Compra un abbonamento annuale per "
+    sale_button_title: "Risparmi il ${{discount}} quando compri l'abbonamento per 1 anno" # {change}
     stripe_description: "Sottoscrizione mensile"
-    stripe_description_year_sale: "Abbonamneto annuale (sconto $21)" # {change}
+    stripe_description_year_sale: "Abbonamneto annuale (sconto ${{discount}})" # {change}
     subscription_required_to_play: "Devi essere abbonato per giocare su questo livello."
     unlock_help_videos: "Abbonati per accedere a tutti i tutorial video."
     personal_sub: "Sottoscrizione Personale" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     currently_free_until: "Hai un abbonamento valido fino al"
     was_free_until: "Hai avuto un abbonamento gratuito fino al "
     managed_subs: "Gestione Abbonamenti"
-    managed_subs_desc: "Aggiungi un abbonamento per altri giocatori (studenti, bambini, etc.)"
-    managed_subs_desc_2: "I beneficiari devono avere un abbonamento CodeCombat associato con l'email fornito."
-    group_discounts: "Sconto comitiva"
-    group_discounts_1: "Offriamo sconto comitiva anche per abbonamenti in grandi volumi."
-    group_discounts_1st: "Prima sottoscrizione"
-    group_discounts_full: "Prezzo completo"
-    group_discounts_2nd: "Sottoscrizione 2-11"
-    group_discounts_20: "20% disconto"
-    group_discounts_12th: "Sottoscrizione 12+"
-    group_discounts_40: "40% di sconto"
     subscribing: "Abbonamento..."
-    recipient_emails_placeholder: "Inserisci l'indirizzo email per abbonarti, uno per linea."
-    subscribe_users: "Iscrivere Utenti"
-    users_subscribed: "Utenti iscritti:"
-    no_users_subscribed: "Utente non abbonato, per favore verifica il tuo indirizzo di email."
     current_recipients: "Destinatari attuali"
     unsubscribing: "Deregistrazione"
     subscribe_prepaid: "Clicca su Registrazione per usare un codice pre pagato"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     josh_c_blurb: "Progettista giochi"
     carlos_title: "Manager Regionale, Brasile"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Informazzione per Professori"
-    intro_1: "CodeCombat è un gioco online che insegna a programmare. Gli studenti scrivono del codice in veri linguaggi di programmazione."
-    intro_2: "Non serve esperienza!"
-    free_title: "Quanto costa?"
-    cost_premium_server: "CodeCombat è gratuito per i primi cinque livelli, dopo i quali costa $9.99 dollari al mese per accedere agli oltre 190 livelli sui nostri esclusivi server specifici per regione."
-    free_1: "Ci sono oltre 110 livelli gratuiti che coprono ogni concetto."
-    free_2: "Un abbonamento mensile consente l'accesso ai video tutorial ed ai livelli di pratica extra."
-    free_3: "Il contenuto di CodeCombat è diviso in"
-    free_4: "corsi"
-    free_5: ".  Il primo corso è gratuiro, e circa un'ora di materiale."
-    free_6: "L'accesso ad ulteriori corsi può essere attivato con un'acqusto una-tantum."
-    teacher_subs_title: "Gli insegnanti ottengono una prova gratuita!"
-    teacher_subs_0: "Offriamo prove gratiote agli insegnanti."
-    teacher_subs_1: "Per favore, riempi il nostro"
-    teacher_subs_2: "sondaggio per docenti"
-    teacher_subs_3: "per provare i corsi a pagamento."
-    sub_includes_title: "Cosa include l'abbonamento?"
-    sub_includes_1: "Gli studenti con un abbonamento mensile, hanno accesso, oltre che agli oltre 110+ livelli base, a queste funzioni aggiuntive:"
-    sub_includes_2: "oltre 80 livelli di pratica"
-    sub_includes_3: "Video tutorial"
-    sub_includes_4: "Supporto via mail premium"
-    sub_includes_5: "10 nuovi eroi con uniche caratteristiche da usare"
-    sub_includes_6: "3500 gemme bonus ogni mese"
-    sub_includes_7: "Clan Privati"
-    monitor_progress_title: "Come controllo i progressi dei miei studenti?"
-    monitor_progress_1: "I progressi degli studenti possono essere controllati creando un"
-    monitor_progress_2: "per la tua classe."
-    monitor_progress_3: "Per aggiungere uno studente, inviagli un link per il tuo Clan, che è sulla pagina"
-    monitor_progress_4: "."
-    monitor_progress_5: "Quando accederà, potrai visualizzare un riassunto dei progressi dello studente sulla pagina del tuo Clan."
-    private_clans_1: "I Clan Privati consentono un'ulteriore privacy ed informazioni dettagliate sui progressi di ogni studente."
-    private_clans_2: "Per creare un Clan Privato, spunta 'Rendi il clan privato' quando crei un"
-    private_clans_3: "."
     who_for_title: "A chi è indirizzato CodeCombat?"
-    who_for_1: "Consigliamo CodeCombat agli studentida 9 anni in su. Non occorre una precedente esperienza in programmazione."
-    who_for_2: "Abbiamo creato CodeCombat perchè possa piacere sia ai ragazzi che alle ragazze."
-    material_title: "Quanto materiale c'è?"
-    material_premium_server: "Circa 50 ore di gioco distribuite su oltre 190 livelli per solo abbonamento, finora."
-    material_1: "Circa 25 ore di contenuto gratuito ed ulteriori 15 ore di contenuti in abbonamento."
-    concepts_title: "Quali concetti sono approfonditi?"
-    how_much_title: "Quanto costa l'abbonamento mensile?"
-    how_much_1: "Un"
-    how_much_2: "abbonamento mensile"
-    how_much_3: "costa $9.99 e può essere annullato in ogni momento."
-    how_much_4: "Inoltre, forniamo sconti per gruppi più grandi:"
-    how_much_5: "Accettiamo pagamenti una-tantum ed abbonamenti annuali per gruppi, come classi o scuole."
-    how_much_6: "per ulteriori dettagli:"
+    who_for_1: "Consigliamo CodeCombat agli studentida 9 anni in su. Non occorre una precedente esperienza in programmazione." # {change}
+    who_for_2: "Abbiamo creato CodeCombat perchè possa piacere sia ai ragazzi che alle ragazze." # {change}
     more_info_title: "Dove posso trovare ulteriori informaazioni?"
     more_info_1: "Il nostro"
     more_info_2: "forum insegnanti"
     more_info_3: "è un buon luogo in cui conoscere con altri doventi che stanno usando CodeCombat."
-    sys_requirements_title: "Requisiti di sistema"
-    sys_requirements_1: "Un moderno broswer. Chrome, Firefox o Safari vanno bene. Internet Explorer funziona dalla versione 9 in su."
-    sys_requirements_2: "CodeCombat non è ancora supportato su iPad."
 
   teachers_survey:
     title: "Sondaggio Insegnanti"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     screenshot_included: "Screenshot incluso."
     where_reply: "Dove dovremmo risponderti?"
     send: "Invia feedback"
-    contact_candidate: "Contatta Candidato" # Deprecated
-    recruitment_reminder: "Usa questo form per raggiungere i candidati a cui sei interessato. Ricorda che CodeCombat richiede il 15% dello stipendio del primo anno. Il pagamento è dovuto all'atto dell'assunzione ed è rimborsabile per 90 giorni se il dipendente non resta in azienda. Gli impiegati part-time, removi ed contratto sono gratuiti, essendo interni." # Deprecated
 
   account_settings:
     title: "Impostazioni account"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     saved: "Modifiche salvate"
     password_mismatch: "La password non corrisponde."
     password_repeat: "Ripeti la tua password."
-    job_profile: "Profilo Lavorativo" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Il tuo profilo lavorativo è stato approvato da CodeCombat. I datori di lavoro saranno in grado di visualizzarlo finchè non lo segnalerai come inattivo o non lo abbandonerai senza modifiche per più di 4 settimane."
-    job_profile_explanation: "Ciao! Riempi questo modulo, e ci metteremo a lavoro per trovarti un lavoro da sviluppatore."
-    sample_profile: "Visualizza un profilo di esempio"
-    view_profile: "Visualizza il tuo profilo"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Scorciatoie da tastiera"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     subs_only: "solo per abbonati"
     create_clan: "Crea nuovo clan"
     private_preview: "Anteprima"
+#    private_clans: "Private Clans"
     public_clans: "Clan pubblici"
     my_clans: "I miei clan"
     clan_name: "Nome clan"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     payments: "Pagamenti"
     prepaid_codes: "Codici prepagati"
     purchased: "Acquistato"
-    sale: "Offerta"
     subscription: "Abbonamento"
     invoices: "Fatture"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     email_settings_url: "tue impostazioni email"
     email_description_suffix: "o con i link contenuti nei messaggi puoi cambiare le tue preferenze o smettere di riceverli facilmente in qualsiasi momento."
     cost_title: "Costi"
-    cost_description: "Puoi giocare gratuitamente a tutti i livelli principali di CodeCombat, con un abbonamento di 9.99$/mese per accedere a set di livelli extra e ottenere 3500 gemme al mese. Puoi annullare l'abbonamento con un click, e offriamo una garanzia di rimborso completo."
+    cost_description: "Puoi giocare gratuitamente a tutti i livelli principali di CodeCombat, con un abbonamento di {{price}}$/mese per accedere a set di livelli extra e ottenere {{gems}} gemme al mese. Puoi annullare l'abbonamento con un click, e offriamo una garanzia di rimborso completo."
     copyrights_title: "Diritti e licenze"
     contributor_title: "Accordo di licenza per i contributi (CLA)"
     contributor_description_prefix: "Tutti i contributi, qui sul sito e sulla repository GitHub, sono soggetti al nostro"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     nutshell_title: "In poche parole"
     nutshell_description: "Qualsiasi risorsa che inseriamo nell'Editor livelli è di libero uso per la creazione dei livelli. Ci riserviamo però il diritto di limitare la distribuzione dei livelli stessi (creati su codecombat.com) che quindi potranno essere a pagamento in futuro, se questo è ciò che finirà per succedere."
     canonical: "La versione inglese di questo documento è quella definitiva a cui fare fede. Se ci sono discrepanze tra le traduzioni, la versione inglese ha la precedenza."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premi torneo" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     license: "licenza"
     oreilly: "ebook a tua scelta"
 
-  account_profile:
-    settings: "Impostazioni" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Modifica profilo"
-    done_editing: "Fine modifica"
-    profile_for_prefix: "Profilo per "
-    profile_for_suffix: ""
-    featured: "In Vetrina"
-    not_featured: "Non in Vetrina"
-    looking_for: "In cerca di:"
-    last_updated: "Ultimo aggiornamento:"
-    contact: "Contatto"
-    active: "In cerca di interviste ora"
-    inactive: "Non in cerca di offerte ora"
-    complete: "completo"
-    next: "Prossimo"
-    next_city: "prossima città"
-    next_country: "scegli la tua nazione."
-    next_name: "nome"
-    next_short_description: "scrivi una breve descrizione"
-    next_long_description: "descrivi la tua posizione che vorresti."
-    next_skills: "elenca almeno cinque competenze."
-    next_work: "riassumi la tua esperienza lavorativa."
-    next_education: "riassumi i tuoi studi."
-    next_projects: "mostra fino a tre progetti in cui hai lavorato."
-    next_links: "aggiungi qualunque link personale o social."
-    next_photo: "aggiungi una foto professionale opzionale."
-    next_active: "impostati aperto alle offerte per essere mostrato nelle ricerche."
-    example_blog: "Blog"
-    example_personal_site: "Sito Personale"
-    links_header: "Link Personali"
-    links_blurb: "Link a qualunque altro sito o profilo tu voglia mostrare, come il tuo GitHub, LinkedIn, o il tuo blog."
-    links_name: "Nome Link"
-    links_name_help: "A cosa stai linkando?"
-    links_link_blurb: "Link URL"
-    basics_header: "Aggiorna informazioni di base"
-    basics_active: "Aperto alle Offerte"
-    basics_active_help: "Vuoi avere delle offerte d'intervista ora?"
-    basics_job_title: "Titolo Lavorativo Desiderato"
-    basics_job_title_help: "Di che ruolo sei in cerca?"
-    basics_city: "Città"
-    basics_city_help: "Cottà in cui vorresti lavorare (o in cui lavori ora)."
-    basics_country: "Paese"
-    basics_country_help: "Paese in cui ti piacerebbe lavorare (o in cui vivi ora)."
-    basics_visa: "Stato lavorativo in USA"
-    basics_visa_help: "Sei autorizzato a lavorare negli USA, o richiedi una sponsorizzazione per la visa? Se vivi in Canada o Australia, imposta autorizzato.)"
-    basics_looking_for: "Cerco"
-    basics_looking_for_full_time: "Full-time"
-    basics_looking_for_part_time: "Part-time"
-    basics_looking_for_remote: "Remoto"
-    basics_looking_for_contracting: "A contratto"
-    basics_looking_for_internship: "Stagista"
-    basics_looking_for_help: "Che tipo di ruolo da sviluppatore vorresti?"
-    name_header: "Immetti il tuo nome"
-    name_anonymous: "Sviluppatore Anonimo"
-    name_help: "Nomina dei datori di lavoro che vorresti vedere (es.: 'Nick Winter')."
-    short_description_header: "Scrivi una breve descrizione di te stesso"
-    short_description_blurb: "Aggiungi una citazione per aiutare il datore di lavoro a capirti meglio."
-    short_description: "Citazione"
-    short_description_help: "Chi sei, e cosa cerchi? 140 caratteri max."
-    skills_header: "Competenze"
-    skills_help: "Cita comptetenze di programmazione in ordine di conoscenza."
-    long_description_header: "Descrivi la il ruolo che desideri"
-    long_description_blurb: "Racconta ai datodi di lavoro quanto sei bravo e che ruolo vorresti."
-    long_description: "Autodescrizione"
-    long_description_help: "Descriviti ai potenziali datori di lavoro. Sii breve ed arriva al punto. Ti raccomandiamo di sottolineare il tuolo che preferiresti. Markdown è okay, 600 characters max."
-    work_experience: "Esperienza Lavorativa"
-    work_header: "Storia lavorativa"
-    work_years: "Anni di esperienza"
-    work_years_help: "Quanti anni di esperienza lavorativa (retribuita) nello sviluppo software hai?"
-    work_blurb: "Elenca la tua esperienza lavorativa, prima il più recente."
-    work_employer: "Datore di lavoro"
-    work_employer_help: "Nome del datore di lavoro."
-    work_role: "Titolo lavorativo"
-    work_role_help: "Quale era il tuo titolo o ruolo lavorativo?"
-    work_duration: "Durata"
-    work_duration_help: "Per quanto hai lavorato?"
-    work_description: "Descrizione"
-    work_description_help: "Cosa hai fatto lì? (140 caratteri, opzionale)"
-    education: "Educazione"
-    education_header: "Riassumi i tuoi studi"
-    education_blurb: "Elenca i tuoi studi."
-    education_school: "Scuola"
-    education_school_help: "Nome della scuola."
-    education_degree: "Laurea"
-    education_degree_help: "Quale è stata la tua laurea, ed in che ambito di studi?"
-    education_duration: "Date"
-    education_duration_help: "Quando?"
-    education_description: "Descrizione"
-    education_description_help: "Evidenzia tutto della tua esperienza di studi. (140 caratteri; opzionale)"
-    our_notes: "Note di CodeCombat"
-    remarks: "Osservazioni"
-    projects: "Progetti"
-    projects_header: "Aggiungi 3 progetti"
-    projects_header_2: "Progetti (Top 3)"
-    projects_blurb: "Evidenzia i tuoi progetti per stupire i datori di lavoro."
-    project_name: "Nome progetto"
-    project_name_help: "Come si chiamava il progetto?"
-    project_description: "Descrizione"
-    project_description_help: "Descrivi brevemente il progetto."
-    project_picture: "Immagine"
-    project_picture_help: "Carica una immagine che mostri il progetto di almeno 230x115 pixel."
-    project_link: "Link"
-    project_link_help: "Link al progetto."
-    player_code: "Codice Giocatore"
-
-  employers:
-    deprecation_warning_title: "Spiacenti, CodeCombat non assume in questo momento."
-    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-    hire_developers_not_credentials: "Assumi sviluppatori, non credenziali.." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Inizia"
-    already_screened: "Abbiamo praticamente già effettuato lo screening di tutti i nostri candidati"
-    filter_further: ", ma puoi anche filtrare ulteriormente:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizzato US"
-    filter_visa_no: "Non Autorizzato"
-    filter_education_top: "Top School"
-    filter_education_other: "Altri"
-    filter_role_web_developer: "Web Developer"
-    filter_role_software_developer: "Software Developer"
-    filter_role_mobile_developer: "Mobile Developer"
-    filter_experience: "Esperienza"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Neolaureato"
-    filter_experience_student: "Studente College"
-    filter_results: "risultati"
-    start_hiring: "Inizia ad assumere."
-    reasons: "Tre motivi per cui dovresti assumere attraverso noi:"
-    everyone_looking: "Tutti qui sono alla ricerca della loro prossima opportunità."
-    everyone_looking_blurb: "Dimentica il 20% del tasso di risposta di LinkedIn InMail. Tutti quelli che abbiamo in lista su questo sito vogliono trovare il loro nuovo lavoro e risponderanno per un colloquio."
-    weeding: "Mettiti comodo: ti stiamo sposando! (?!)"
-    weeding_blurb: "Ogni giocatore che abbiamo in lista è stato controllato per la sua abilità tecnica. Effettuiamo anche delle chiamate telefoniche per selezionare candidati ed aggiungiamo note sui loro profili per farti guadagnare tempo."
-    pass_screen: "Passeranno il tuo sistema di screening senza alcun dubbio."
-    pass_screen_blurb: "Dai un occhio al codice di ogni candidato prima di contattarlo. Un datore di lavoro ha notato che i nostri candidati passavano i loro colloqui 5 volte più di quelli trovati su Hacker News."
-    make_hiring_easier: "Rendi la mia assunzione più facile, per favore."
-    what: "Cos'è CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-    cost: "Quale è la tariffa?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Nome"
-    candidate_location: "Località"
-    candidate_looking_for: "In cerca di"
-    candidate_role: "Ruolo"
-    candidate_top_skills: "Top Skills"
-    candidate_years_experience: "Anni Esp."
-    candidate_last_updated: "Ultimo Aggiornamento"
-    candidate_who: "Chi"
-    featured_developers: "Sviluppatori in Vetrina"
-    other_developers: "Altri Sviluppatori"
-    inactive_developers: "Sviluppatori Inattivi"
-
   admin:
     av_espionage: "Spionaggio" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email o nome utente"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     av_entities_sub_title: "Entità"
     av_entities_users_url: "Utenti"
     av_entities_active_instances_url: "Istanze attive"
-    av_entities_employer_list_url: "Lista datore di lavoro"
-    av_entities_candidates_list_url: "Lista Candidati"
     av_entities_user_code_problems_list_url: "Lista problemi codice utenti"
     av_other_sub_title: "Altro"
     av_other_debug_base_url: "Base (per il debug di base.jade)"
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index b92387497..fac55c734 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     multiplayer: "マルチプレイヤー" # Not currently shown on home page
     for_developers: "開発者向け" # Not currently shown on home page.
     or_ipad: "又はiPadでダウンロード"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "ゲームマップへ" # The top nav bar entry where players choose which levels to play
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     creating: "アカウントを作成しています..."
     sign_up: "アカウント登録"
     log_in: "パスワードでログイン"
-    social_signup: "あるいはFacebookやGoogle+でログイン:"
     required: "ログインする必要があります"
     login_switch: "すでにアカウントをお持ちですか？"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "学校名と市名"
+    optional: "オプション"
+    school_name_placeholder: "エグザンプル高校, なんとか市, 日本"
 
   recover:
     recover_account_title: "パスワードを忘れた場合"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     incomplete: "不完全"
     timed_out: "時間切れ"
     failing: "失敗中"
-    action_timeline: "アクション・タイムライン"
-    click_to_select: "ユニットを左クリックで選択してください"
     control_bar_multiplayer: "マルチプレイ"
     control_bar_join_game: "ゲームに参加する"
     reload: "リロード"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     josh_c_blurb: "ゲームのデザイン"
     carlos_title: "地域部長, ブラジル"
     carlos_blurb: "サラリーマン"
+    maka_title: "顧客主義"
+    maka_blurb: "ストーリーテラー"
 
   teachers:
-    more_info: "教育関係者へのお知らせ"
-    intro_1: "CodeCombat はプログラミングを教えるオンラインゲームです。生徒は本物のプログラム言語を書きます。"
-    intro_2: "プログラミングの経験は必要ありません！"
-    free_title: "価格について"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "CodeCombat は基本的に無料です！110以上のレベルが無料です。" # {change}
-    free_2: "月々の課金をするとビデオのチュートリアルにアクセスでき、また追加のレベルが楽しめます。"
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "教育関係者は無料のサブスクリプションを得ることができます！" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "" # {change}
-    teacher_subs_2: "に連絡して無料の月々のサブスクリプションを得ましょう。" # {change}
-#    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "サブスクリプションの内容について"
-    sub_includes_1: "110以上の基本レベルに加えて、生徒は月々のサブスクリプションを得て次の機能が使えます:" # {change}
-    sub_includes_2: "70以上の練習レベル" # {change}
-    sub_includes_3: "ビデオチュートリアル"
-    sub_includes_4: "メールによるサポート"
-    sub_includes_5: "10人の新しいヒーローとマスターのユニークなスキル" # {change}
-    sub_includes_6: "3500のジェムが月々支給されます"
-    sub_includes_7: "プライベートクラン"
-    monitor_progress_title: "生徒の進捗状況を確認するにはどうすればよいですか？"
-    monitor_progress_1: "生徒の進捗状況を確認するには"
-    monitor_progress_2: "クラスをつくります。"
-    monitor_progress_3: "生徒を追加するには, あなたのクランの招待リンクを送信します, 招待リンクは"
-    monitor_progress_4: "ページ上にあります。"
-    monitor_progress_5: "生徒が参加したら, クランページで生徒の進捗状況の概要が表示されます。"
-    private_clans_1: "プライベートクランは各学生のプライバシーが向上し進捗情報が詳細化しています。"
-    private_clans_2: "プライベートクランを作るには, "
-    private_clans_3: "を作成するとき、'クランをプライベートにする'のチェックボックスをチェックします。"
     who_for_title: "CodeCombat が必要なひと"
-    who_for_1: "私たちは CodeCombat を9歳以上の生徒にオススメしています。プログラミングの経験は必要ありません。"
-    who_for_2: "私たちは男女問わず遊べるように CodeCombat をデザインしました。"
-    material_title: "どのぐらいコンテンツがありますか？"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-    material_1: "8時間ほどの無料のコンテンツに加え、サブスクリプションによってさらに14時間ほどプレイすることができ、毎週5つの新しいレベルが追加されています。" # {change}
-    concepts_title: "どのような概念がカバーされているかについて"
-    how_much_title: "月々のサブスクリプションはいくらですか？"
-    how_much_1: ""
-    how_much_2: "月々のサブスクリプションは"
-    how_much_3: "$9.99 で、これはいつでもキャンセルできます。"
-    how_much_4: "さらに、私たちは大きなグループにディスカウントを行っています:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
-#    more_info_title: "Where can I find more information?"
-#    more_info_1: "Our"
-#    more_info_2: "teachers forum"
-#    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "動作環境"
-    sys_requirements_1: "モダンなブラウザ。最新の Chrome や FireFox, Safari など。Internet Explorer 9 以上。"
-    sys_requirements_2: "CodeCombat はまだ iPad をサポートしていません。"
+    who_for_1: "私たちは CodeCombat を9歳以上の生徒にオススメしています。プログラミングの経験は必要ありません。" # {change}
+    who_for_2: "私たちは男女問わず遊べるように CodeCombat をデザインしました。" # {change}
+    more_info_title: "もっと情報がほしい人"
+    more_info_1: "私たちの"
+    more_info_2: "ティーチャーフォーラム"
+    more_info_3: "でCodeCombatを使っている教育者の仲間とつながりましょう。"
 
   teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     screenshot_included: "スクリーンショットが含まれています。"
     where_reply: "何処へ返信すれば宜しいですか？"
     send: "フィードバックを送信"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "アカウント設定"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     saved: "変更しました"
     password_mismatch: "パスワードが違います"
     password_repeat: "もう一度パスワードを入力してください"
-    job_profile: "求職情報" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "CodeCombatは、あなたの求職情報を承りました。無効にする、もしくは4週間の間変更をしなければ雇用者はあなたの求職情報を見ることができなくなります。"
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-    sample_profile: "サンプルプロファイルを参照してください"
-    view_profile: "あなたのプロフィールを表示"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "キーボードショートカット"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     subs_only: "課金者限定"
     create_clan: "新規クラン作成"
     private_preview: "プレビュー"
+#    private_clans: "Private Clans"
     public_clans: "公開クラン"
     my_clans: "マイ・クラン"
     clan_name: "クラン名"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1293,7 +1211,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    games_played: "Games played"
     ratio: "比率  "
     leaderboard: "リーダーボード"
-#    battle_as: "Battle as "
+    battle_as: "対戦  "
     summary_your: "あなたの "
     summary_matches: "戦闘数 - "
     summary_wins: " 勝利数, "
@@ -1304,7 +1222,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     rank_submitted: "ランキングに送信されました。"
     rank_failed: "ランキングに送信できませんでした。"
     rank_being_ranked: "ランキングにのっています"
-#    rank_last_submitted: "submitted "
+    rank_last_submitted: "送信"
 #    help_simulate: "Help simulate games?"
 #    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
 #    no_ranked_matches_pre: "No ranked matches for the "
@@ -1338,11 +1256,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     rules: "ルール"
     winners: "勝者"
     league: "リーグ"
-#    red_ai: "Red CPU" # "Red AI Wins", at end of multiplayer match playback
-#    blue_ai: "Blue CPU"
-#    wins: "Wins" # At end of multiplayer match playback
-#    humans: "Red" # Ladder page display team name
-#    ogres: "Blue"
+    red_ai: "レッドCPU" # "Red AI Wins", at end of multiplayer match playback
+    blue_ai: "ブルーCPU"
+    wins: "勝利" # At end of multiplayer match playback
+    humans: "レッド" # Ladder page display team name
+    ogres: "ブルー"
 
   user:
     stats: "ステータス"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-    profile_for_suffix: "のプロフィール"
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "検索:"
-    last_updated: "最終更新:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "職務経験"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "学歴"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-    filter_experience_student: "大学生"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "名前"
-    candidate_location: "勤務地"
-    candidate_looking_for: "希望"
-    candidate_role: "職種"
-    candidate_top_skills: "得意分野"
-    candidate_years_experience: "経験年数"
-    candidate_last_updated: "最終更新日時"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    av_entities_sub_title: "Entities"
     av_entities_users_url: "ユーザー"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "その他"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index 74135541b..5b5c955db 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     multiplayer: "멀티플레이어" # Not currently shown on home page
     for_developers: "개발자용" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "레벨" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     creating: "계정을 생성 중입니다..."
     sign_up: "등록"
     log_in: "비밀번호로 로그인"
-    social_signup: "또는 페이스북이나 구글 플러스로 계정을 만들 수 있습니다."
     required: "진행하기 전에 로그인이 필요합니다."
     login_switch: "이미 계정이 있으신가요?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     incomplete: "목표 미완료"
     timed_out: "제한 시간 초과"
     failing: "다시 한번 더 도전해보세요."
-    action_timeline: "액션 타임라인"
-    click_to_select: "유닛을 선택하기 위해서 유닛을 마우스로 클릭하세요."
     control_bar_multiplayer: "멀티플레이어"
     control_bar_join_game: "게임입장"
     reload: "새로고침"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "의견 보내기"
-    contact_candidate: "지원자에게 연락하기" # Deprecated
-    recruitment_reminder: "인터뷰를 원하는 지원자에게 연락하고자 할 때, 이 양식을 사용해주세요. 코드 컴뱃에게 반드시 첫 해 연봉의 15%를 지급해야합니다. 수수료는 직원을 고용하자마자 즉시 지급되어야 합니다. 한편 90일 이내로 채용이 취소된다면 수수료를 환불받을 수 있습니다. 아르바이트, 재택근무, 계약직은 인턴의 경우와 마찬가지로 수수료가 없습니다." # Deprecated
 
   account_settings:
     title: "계정 설정"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     saved: "변경사항 저장 완료"
     password_mismatch: "비밀번호가 일치하지 않습니다."
     password_repeat: "비밀번호를 한번 더 입력해 주세요."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-    view_profile: "나의 프로필 보기"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "단축키"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    subs_only: "subscribers only"
     create_clan: "새로운 클랜 만들기"
     private_preview: "미리보기"
+#    private_clans: "Private Clans"
     public_clans: "공개 클랜들"
     my_clans: "내가 속한 클랜"
     clan_name: "클랜 이름"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     email_settings_url: "이메일 설정"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     license: "라이센스"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "설정" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "프로필 수정하기"
-    done_editing: "수정 완료"
-    profile_for_prefix: "프로필 "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "희망 채용형태"
-    last_updated: "최근 업데이트:"
-    contact: "연락하기"
-    active: "구직희망"
-    inactive: "구직희망 안함"
-    complete: "완료"
-    next: "다음으로"
-    next_city: "도시?"
-    next_country: "국가를 선택하세요."
-    next_name: "성명?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "블로그"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-    basics_looking_for_full_time: "풀타임"
-    basics_looking_for_part_time: "파트타임"
-    basics_looking_for_remote: "재택근무"
-    basics_looking_for_contracting: "계약직"
-    basics_looking_for_internship: "인턴쉽"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-    name_header: "성명을 기재하여 주십시오."
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-    short_description_help: "당신은 누구고, 어떤 일을 찾고 있나요? 최대 140자까지 작성할 수 있습니다."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "근무 경력"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     av_entities_sub_title: "속성들"
     av_entities_users_url: "유저들"
     av_entities_active_instances_url: "액티브 인스턴스들"
-    av_entities_employer_list_url: "고용주 리스트"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "다른 사람들"
     av_other_debug_base_url: "베이스 (base.jade 디버깅)"
diff --git a/app/locale/locale.coffee b/app/locale/locale.coffee
index 5e3e508dc..e012325c5 100644
--- a/app/locale/locale.coffee
+++ b/app/locale/locale.coffee
@@ -16,7 +16,7 @@ module.exports =
   'en-US': { nativeDescription: 'English (US)', englishDescription: 'English (US)' }
   'en-GB': { nativeDescription: 'English (UK)', englishDescription: 'English (UK)' }
   'zh-HANS': { nativeDescription: '简体中文', englishDescription: 'Chinese (Simplified)' }
-  'zh-HANT': { nativeDescription: '繁体中文', englishDescription: 'Chinese (Traditional)' }
+  'zh-HANT': { nativeDescription: '繁體中文', englishDescription: 'Chinese (Traditional)' }
   'ru': { nativeDescription: 'русский', englishDescription: 'Russian' }
   'es-ES': { nativeDescription: 'español (ES)', englishDescription: 'Spanish (Spain)' }
   'es-419': { nativeDescription: 'español (América Latina)', englishDescription: 'Spanish (Latin America)' }
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 6d4b1cedd..d68cdefea 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
     or_ipad: "Arba atsisiųskite iPad'ui"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Lygiai" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     creating: "Kuriama paskyra..."
     sign_up: "Užsiregistruoti"
     log_in: "prisijungti slaptažodžio pagalba"
-    social_signup: "Arba galite prisijungti Facebook arba G+:"
     required: "PRieš tęsiant kelią turite prisijungti."
     login_switch: "Jau turite paskyrą?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     incomplete: "Neužbaigta"
     timed_out: "Laikas baigėsi"
     failing: "Nesėkmingai"
-#    action_timeline: "Action Timeline"
-    click_to_select: "Spregtelkite ant veikėjo ar padaro, kad jį pažymėtumėte."
     control_bar_multiplayer: "Žaidimas keliese"
     control_bar_join_game: "Prisijungti prie žaidimo"
     reload: "Perkrauti"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Mygtukai"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/mk-MK.coffee b/app/locale/mk-MK.coffee
index c9b6783ca..14a12f73d 100644
--- a/app/locale/mk-MK.coffee
+++ b/app/locale/mk-MK.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     multiplayer: "Повеќе играчи" # Not currently shown on home page
     for_developers: "За Developer-и" # Not currently shown on home page.
     or_ipad: "Или симни за iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Нивоа" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     creating: "Сметката се прави..."
     sign_up: "Направи сметка"
     log_in: "најави се со лозинка"
-    social_signup: "Или, можеш да се пријавиш преку Facebook или G+:"
     required: "Мораш да се најавиш за да имаш пристап таму."
     login_switch: "Веќе имаш сметка?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     incomplete: "Незавршено"
     timed_out: "Истече времето"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
     control_bar_multiplayer: "Повеќе играчи"
     control_bar_join_game: "Приклучи се во игра"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     parents_title: "Вашето дете ќе научи да програмира." # {change}
     parents_blurb1: "Со CodeCombat, вашите деца учат преку пишување на вистински програмски код. Почнуваат со учење на едноставни команди, по што се продолжува на понапредни теми."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "За $9.99 американски долари месечно, добиваат нови предизвици секоја недела и лична поддршка преку e-mail, од страна на професионални програмери." # {change}
+    parents_blurb2: "За ${{price}} американски долари месечно, добиваат нови предизвици секоја недела и лична поддршка преку e-mail, од страна на професионални програмери." # {change}
     parents_blurb3: "Без ризик: 100% гаранција за враќање на парите, лесно откажување на членството со еден клик."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Месечна членарина"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Треба да бидеш зачленет за да го играш ова ниво."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index 14c2219eb..245b294ba 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     multiplayer: "Ramai-Pemain" # Not currently shown on home page
     for_developers: "Untuk Pengaturcara" # Not currently shown on home page.
     or_ipad: "Atau muat turun untuk iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Mula" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     creating: "Sedang membuat Akaun..."
     sign_up: "Daftar"
     log_in: "Log Masuk"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Hantar Maklumbalas"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     saved: "Pengubahsuian disimpan"
     password_mismatch: "Kata-laluan tidak sama."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-    cost_description: "Buat masa ini, CodeCombat adalah 100% percuma! salah satu daripada tujuan kami adalah untuk membiarkan ia sebegitu, supaya ramai boleh bermain, di mana sahaja mereka berada. Jikalau langit menjadi gelap untuk kami, kami akan mengecaj untuk langganan atau untuk beberapa muatan, tapi kami lebih suka untuk tidak berbuat demikian. Jika kami bernasib baik, kami dapat menanggung syarikat kami dengan:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Hakcipta dan Pemelesenan"
     contributor_title: "Persetujuan Lesen Penyumbang"
     contributor_description_prefix: "Kesemua sumbangan, termasuk di dalam laman dan di dalam repositiri GitHub, tertakluk kepada"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profil untuk "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/my.coffee b/app/locale/my.coffee
index 74e87b3f2..4085985f1 100644
--- a/app/locale/my.coffee
+++ b/app/locale/my.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index 7f4b317a5..3668ab100 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     multiplayer: "Flerspiller" # Not currently shown on home page
     for_developers: "For Utviklere" # Not currently shown on home page.
     or_ipad: "Eller last ned til iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Spill" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     creating: "Oppretter Konto..."
     sign_up: "Lag konto"
     log_in: "logg inn med passord"
-    social_signup: "Eller du kan registrere deg med Facebook eller Google+:"
     required: "Du må være logget inn for å gå dit."
     login_switch: "Har du allerede en konto?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     incomplete: "Ufullstendig"
     timed_out: "Tiden er ute"
     failing: "Mislykkes"
-    action_timeline: "Hendelsestidslinje"
-    click_to_select: "Klikk på en enhet for å velge den."
     control_bar_multiplayer: "Flerspiller"
     control_bar_join_game: "Bli med i spillet"
     reload: "Tilbakestill"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     parents_title: "Barnet ditt vil lære å kode" # {change}
     parents_blurb1: "Med CodeCombat vil dine barn lære seg å skrive ekte kode. De begynner med enkle kommandoer og går videre til mer avanserte emner."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "For USD 9.99 pr mnd, vil de få nye utfordringer hver uke og personlig e-poststøtte fra profesjonelle programmerere." # {change}
+    parents_blurb2: "For USD {{price}} pr mnd, vil de få nye utfordringer hver uke og personlig e-poststøtte fra profesjonelle programmerere." # {change}
     parents_blurb3: "Ingen risiko: 100% pengene tilbake-garanti, kun et klikk for å si opp abonnementet."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Månedlig abonnement"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Du trenger abonnement for å spille dette nivået."
     unlock_help_videos: "Abonnér for å låse opp alle videoveiledningene."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "Systemkrav"
-    sys_requirements_1: "Siden CodeCombat er et spill, er det mer intensivt for datamaskiner å kjøre jevnt enn opplæringsvideo eller -tekst. Vi har optimert det for å kjøre raskt på alle moderne nettlesere, og på eldre maskiner slik at alle kan spille. Når det er sagt, her følger våre anbefalinger for å gå mest ut av din Hour of Code:" # {change}
-    sys_requirements_2: "Bruk nye versjoner av Chrome eller Firefox." # {change}
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     screenshot_included: "Skjermbilde vedlagt."
     where_reply: "Hvor skal vi sende svaret?"
     send: "Send tilbakemelding"
-    contact_candidate: "Kontakt kandidat" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Kontoinnstillinger"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     saved: "Endringer Lagret"
     password_mismatch: "Passordene er ikke like."
     password_repeat: "Vennligst gjenta passordet."
-    job_profile: "Jobb Profil" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-    sample_profile: "Se en eksempelprofil"
-    view_profile: "Vis Profilen"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Hurtigtaster"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     payments: "Betalinger"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Kjøpt"
-#    sale: "Sale"
     subscription: "Abonnement"
 #    invoices: "Invoices"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     email_settings_url: "epost-innstillingene dine"
     email_description_suffix: "eller via linker i epostene vi sender til deg, kan du endre hvilke eposter du ønsker å motta og enkelt avslutte abonnementet når som helst."
     cost_title: "Pris"
-    cost_description: "For øyeblikket er CodeCombat 100% gratis! Et av hovedmålene våre er å fortsette med det, sånn at flest mulig kan spille, uavhengig av livssituasjon. Hvis ting går dårlig må vi kanskje begynne å ta betalt for abonnement eller annet innhold, men vi vil helst slippe. Med litt flaks vil vi klare å holde selskapet i live med:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Kopirettigheter og lisenser"
     contributor_title: "Lisensavtale for bidragsytere"
     contributor_description_prefix: "Alle bidrag, både gjort gjennom brukergrensesnittet og i kodelageret på GitHub, er underlagt vår"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     nutshell_title: "I et nøtteskall"
     nutshell_description: "Alle ressursene vi har gjort tilgjengelig i Brett-editoren kan fritt brukes til å lage nye Brett. Men vi forbeholder oss rettighetene til å distribuere selve Brettene (som er laget på codecombat.com), slik at vi har muligheten til å kreve betaling for dem i fremtiden, dersom vi ender opp med å gjøre det."
     canonical: "Den engelske utgaven av dette dokumentet er den definitive og gjeldende utgaven. Hvis det er forskjeller i oversettelsen så er det den engelske utgaven som gjelder."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profil for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
     av_espionage: "Spionasje" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Epost eller brukernavn"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     av_entities_sub_title: "Entiteter"
     av_entities_users_url: "Brukere"
     av_entities_active_instances_url: "Aktive Instanser"
-    av_entities_employer_list_url: "Arbeidsgiverliste"
-    av_entities_candidates_list_url: "Kandidatliste"
     av_entities_user_code_problems_list_url: "Brukerkode-problem Liste"
     av_other_sub_title: "Andre"
     av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index 59f2dc272..535da218b 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Voor ontwikkelaars" # Not currently shown on home page.
     or_ipad: "Of download voor iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     creating: "Account aanmaken..."
     sign_up: "Aanmelden"
     log_in: "inloggen met wachtwoord"
-    social_signup: "Of je kunt je registreren met Facebook of G+:"
     required: "Je moet eerst inloggen om die richting te kunnen volgen."
     login_switch: "Heb je al een account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     incomplete: "Onvolledig"
     timed_out: "De tijd is om"
 #    failing: "Failing"
-    action_timeline: "Actie tijdlijn"
-    click_to_select: "Klik op een eenheid om deze te selecteren."
     control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
     reload: "Herlaad"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     parents_title: "Uw kind zal de code leren." # {change}
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-    more_info: "Info voor Leerkrachten"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Feedback Verzonden"
-    contact_candidate: "Contacteer Kandidaat" # Deprecated
-    recruitment_reminder: "Gebruik dit formulier om kandidaten te contacteren voor wie je een interesse hebt om te interviewen. Vergeet niet dat CodeCombat een honorarium vraagt van 18% op het eerste-jaarssalaris. Dit honorarium moet betaald worden als de kandidaat wordt aangenomen en kon tot na 90 dagen terugbetaald worden als deze ontslagen wordt in deze periode. Deeltijds-, contract- en thuiswerkers worden van dit honorarium vrijgesteld, alsook interims." # Deprecated
 
   account_settings:
     title: "Account Instellingen"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
     password_repeat: "Gelieve je wachtwoord te herhalen."
-    job_profile: "Job Profiel" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Jouw job profiel werd goedgekeurd door CodeCombat. Werkgevers zullen het kunnen bekijken totdat je het inactief zet of als er geen verandering in komt voor vier weken."
-    job_profile_explanation: "Hey! Vul dit in en we zullen je contacteren om je een job als softwareontwikkelaar te helpen vinden."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Sneltoetsen"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     email_settings_url: "jouw e-mail instellingen"
     email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven."
     cost_title: "Kosten"
-    cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Auteursrechten en licenties"
     contributor_title: "Licentieovereenkomst voor vrijwilligers"
     contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     nutshell_title: "In een notendop"
     nutshell_description: "Alle middelen die wij aanbieden in de Level Editor zijn gratis te gebruiken om levels aan te maken. Wij behouden ons echter het recht voor om levels die gemaakt zijn op codecombat.com te beperken, en hier in de toekomst geld voor te vragen, moest dat ooit gebeuren."
     canonical: "De Engelse versie van dit document is de definitieve en kanonieke versie. Bij verschillen tussen vertalingen heeft de Engelse versie voorrang."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     license: "licentie"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profiel voor "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "Zoekt naar:"
-    last_updated: "Laatst aangepast:"
-    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-    next_country: "Kies je land."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Werk ervaring"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Opleiding"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "School"
-    education_school_help: "Naam van je school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-    our_notes: "Onze notities"
-#    remarks: "Remarks"
-    projects: "Projecten"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Naam"
-    candidate_location: "Locatie"
-    candidate_looking_for: "Zoekt naar"
-    candidate_role: "Rol"
-    candidate_top_skills: "Beste vaardigheden"
-    candidate_years_experience: "Jaren ervaring"
-    candidate_last_updated: "Laatst aangepast"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     av_entities_sub_title: "Entiteiten"
     av_entities_users_url: "Gebruikers"
     av_entities_active_instances_url: "Actieve instanties"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Andere"
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index de90f6ead..840003ade 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -13,14 +13,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Voor ontwikkelaars" # Not currently shown on home page.
     or_ipad: "Of download voor iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
     community: "Gemeenschap"
-#    courses: "Courses"
+    courses: "Lessen"
     editor: "Editor"
     blog: "Blog"
     forum: "Forum"
@@ -55,7 +52,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 
   play:
     play_as: "Speel als " # Ladder page
-#    compete: "Compete!" # Course details page
+    compete: "Compleet!" # Course details page //in English it says 'complete', so translated that instead.
     spectate: "Toeschouwen" # Ladder page
     players: "Spelers" # Hover over a level on /play
     hours_played: "Speeltijd" # Hover over a level on /play
@@ -66,7 +63,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     locked: "Vergrendeld"
     purchasable: "Te koop" # For a hero you unlocked but haven't purchased
     available: "Beschikbaar"
-#    skills_granted: "Skills Granted" # Property documentation details
+    skills_granted: "Verleende vaardigheden" # Property documentation details
     heroes: "Helden" # Tooltip on hero shop button from /play
     achievements: "Prestaties" # Tooltip on achievement list button from /play
     account: "Account" # Tooltip on account button from /play
@@ -78,7 +75,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     subscription_required: "Abonnement nodig"
     anonymous: "Anonieme Speler"
     level_difficulty: "Moeilijkheidsgraad: "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Speel de klassikale versie" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Beginnercampagne"
     awaiting_levels_adventurer_prefix: "We brengen 5 nieuwe levels per week uit." # {change}
     awaiting_levels_adventurer: "Schrijf je in als Avonturier"
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     creating: "Account aanmaken..."
     sign_up: "Aanmelden"
     log_in: "inloggen met wachtwoord"
-    social_signup: "Of je kunt je registreren met Facebook of G+:"
     required: "Je moet inloggen om daarheen te gaan."
     login_switch: "Heb je al een account?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "School naam en stad"
+    optional: "optioneel"
+    school_name_placeholder: "Voorbeeld middelbare school, Amsterdam"
 
   recover:
     recover_account_title: "Herstel Account"
@@ -164,13 +160,13 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     date: "Datum"
     body: "Inhoud"
     version: "Versie"
-#    pending: "Pending"
+    pending: "In afwachting"
     accepted: "Geaccepteerd"
     rejected: "Afgewezen"
     withdrawn: "Teruggetrokken"
-#    accept: "Accept"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    accept: "Accepteer"
+    reject: "Weiger"
+    withdraw: "Intrekken"
     submitter: "Toevoeger"
     submitted: "Toegevoegd"
     commit_msg: "Commit Bericht"
@@ -225,12 +221,12 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     years: "jaren"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "Voltooid Level:"
+    course: "Les:"
     done: "Klaar"
-#    next_level: "Next Level:"
-#    next_game: "Next game"
-#    show_menu: "Show game menu"
+    next_level: "Volgende Level:"
+    next_game: "Volgende spel"
+    show_menu: "Geef spelmenu weer"
     home: "Home" # Not used any more, will be removed soon.
     level: "Level" # Like "Level: Dungeons of Kithgard"
     skip: "Overslaan"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     incomplete: "Incompleet"
     timed_out: "De tijd is op"
     failing: "Mislukken"
-    action_timeline: "Actie tijdlijn"
-    click_to_select: "Klik op een eenheid om deze te selecteren."
     control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Meespelen"
     reload: "Herlaad"
@@ -330,25 +324,25 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     tip_premature_optimization: "vroegtijdig optimaliseren is de wortel van al het kwaad. - Donald Knuth"
     tip_brute_force: "Wanneer je twijfelt, gebruik brute force. - Ken Thompson"
     tip_extrapolation: "Er zijn twee soorten mensen: Zij die iets kunnen afleiden van onvolledige gegevens..."
-#    tip_superpower: "Coding is the closest thing we have to a superpower."
-#    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
+    tip_superpower: "Van alle dingen komt programmeren het dichtst in de buurt van een superkracht."
+    tip_control_destiny: "In echte open source, hebt je het recht om je eigen toekomst te bepalen. - Linus Torvalds"
     tip_no_code: "Geen code is sneller dan geen code."
     tip_code_never_lies: "Code liegt niet, commentaar soms wel. — Ron Jeffries"
     tip_reusable_software: "voor code herbruikbaar kan zijn, moet het bruikbaar zijn."
-#    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
+    tip_optimization_operator: "Iedere taal heeft een optimalisatie operator. In de meeste talen is die operator ‘//’"
     tip_lines_of_code: "programmeervoortgang meten met lijnen code, is als vliegtuigbouwvoortgang meten bij gewicht. — Bill Gates"
     tip_source_code: "Ik wil de wereld veranderen, maar ze geven me de broncode niet."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
+    tip_javascript_java: "Java staat tot JavaScript, als Kar staat tot Karpet. - Chris Heilmann"
     tip_move_forward: "Wat je ook doet, ga vooruit. - Martin Luther King Jr."
     tip_google: "Heb je een probleem dat je niet kan oplossen? Googel het!"
     tip_adding_evil: "Een snufje kwaad toevoegen."
     tip_hate_computers: "Mensen die denken dat ze de computer haten, haten eigenlijk slechte programmeurs. - Larry Niven"
     tip_open_source_contribute: "Je kunt helpen CodeCombat te verbeteren!"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
+    tip_recurse: "Itereren is menselijk, recursiveren is goddelijk. - L. Peter Deutsch"
     tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
     tip_strong_opponents: "Zelf de sterkste vijand heeft een zwakheid. - Itachi Uchiha"
     tip_paper_and_pen: "Voor je begint te programmeren, kan je altijd met pen en papier een plan maken."
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_solve_then_write: "Los eerst het probleem op. Schrijf dan de code. - John Johnson"
 
   game_menu:
     inventory_tab: "Inventaris"
@@ -363,20 +357,20 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     choose_hero_caption: "Kies held, taal"
     save_load_caption: "... en bekijk de geschiedenis"
     options_caption: "Instellingen"
-#    guide_caption: "Docs and tips"
+    guide_caption: "Documenten en tips"
     multiplayer_caption: "Speel met vrienden!"
     auth_caption: "Bewaar je voortgang."
 
   leaderboard:
     view_other_solutions: "Bekijk Klassement"
     scores: "Scores"
-#    top_players: "Top Players by"
+    top_players: "Top Spelers per"
     day: "Vandaag"
     week: "Deze week"
     all: "Altijd"
     time: "tijd"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
+    damage_taken: "Schade ontvangen"
+    damage_dealt: "Schade uitgedeeld"
     difficulty: "Moeilijkheidsgraad"
     gold_collected: "Goud verzameld"
 
@@ -406,14 +400,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    price: "x3500 / mo"
 
   subscribe:
-#    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
+    comparison_blurb: "Verbeter je vaardigheden met een abonement op CodeCombat!"
     feature1: "meer dan 110+ basislevels over 4 werelden"
     feature2: "10 sterke <strong>nieuwe helden</strong> met unieke vaardigheden!"
     feature3: "70+ bonuslevels" # {change}
-#    feature4: "<strong>3500 bonus gems</strong> every month!"
+    feature4: "<strong>3500 bonus edelstenen</strong> elke maand!"
     feature5: "Video cursussen"
-#    feature6: "Premium email support"
-#    feature7: "Private <strong>Clans</strong>"
+    feature6: "Hoogwaardige e-mail ondersteuning"
+    feature7: "Besloten <strong>Clans</strong>"
     free: "Gratis"
     month: "maand"
     must_be_logged: "Je moet eerst ingelogd zijn. Maak een account aan of log in in het menu hierboven."
@@ -438,33 +432,19 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     parents_title: "Uw kind leert programmeren." # {change}
     parents_blurb1: "Met CodeCombat leert uw kind door echte code te schrijven. Ze beginnen met simpele instructies en naarmate ze verder komen, komen er moeilijkere onderwerpen aan bod."
     parents_blurb1a: "Programmeren is een essentiële vaardigheid die uw kind als volwassene ongetwijfeld gaat gebruiken. In 2020 is de basis van programmeren nodig bij 77% van de banen en zijn softwareontwikkelaars dringend nodig in de wereld. Wist u dat informatica de hoogstbetaalde universitaire graad is?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
     parents_blurb3: "Geen risico's: 100% geld terug garantie, 1-klik uitschrijving."
     payment_methods: "Betaalmethoden"
     payment_methods_title: "Geaccepteerde betaalmethoden"
     payment_methods_blurb1: "Momenteel worden alleen credit cards en Alipay geaccepteerd." # {change}
     payment_methods_blurb2: "Als u op een andere manier wilt betalen, neem dan alstublieft contact op"
-    sale_already_subscribed: "Je bent al ingeschreven!"
-    sale_blurb1: "bespaar $21" # {change}
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
     sale_button: "Koopje!"
-    sale_button_title: "Bespaar $21 bij aankoop van een 1-jaars abonnement" # {change}
-    sale_click_here: "Klik hier"
-    sale_ends: "Eindigt"
-    sale_extended: "*Bestaande abbonementen zullen worden verlengd met 1 jaar."
-    sale_feature_here: "Dit krijg je:"
-    sale_feature2: "Toegang tot 9 sterke <strong>nieuwe helden</strong> met speciale vaardigheden!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-    sale_continue: "Klaar voor het avontuur?"
-#    sale_limited_time: "Limited time offer!"
-    sale_new_heroes: "Nieuwe helden!"
-#    sale_title: "Back to School Sale"
-    sale_view_button: "Koop een 1-jarig abonnement voor"
+    sale_button_title: "Bespaar ${{discount}} bij aankoop van een 1-jaars abonnement" # {change}
     stripe_description: "Maandelijks abonnement"
-    stripe_description_year_sale: "1-jarig abonnement ($21 korting)" # {change}
+    stripe_description_year_sale: "1-jarig abonnement (${{discount}} korting)" # {change}
     subscription_required_to_play: "Je hebt een abonnement nodig om dit level te spelen."
-#    unlock_help_videos: "Subscribe to unlock all video tutorials."
-#    personal_sub: "Personal Subscription" # Accounts Subscription View below
+    unlock_help_videos: "Abonneer om toegang te krijgen tot alle instructievideos."
+    personal_sub: "Persoonlijk Abonnement" # Accounts Subscription View below
 #    loading_info: "Loading subscription information..."
 #    managed_by: "Managed by"
 #    will_be_cancelled: "Will be cancelled on"
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-    group_discounts: "Groepskorting"
-    group_discounts_1: "We bieden groepskortingen aan voor grote groepen."
-    group_discounts_1st: "eerste abonnement"
-    group_discounts_full: "hele prijs"
-    group_discounts_2nd: "Abonnementen 2-11"
-    group_discounts_20: "20% korting"
-    group_discounts_12th: "Abonnementen boven 11"
-    group_discounts_40: "40% korting"
     subscribing: "Inschrijven..."
-    recipient_emails_placeholder: "Voer emailadres in om in te schrijven, een per regel."
-    subscribe_users: "Gebruikers inschrijven"
-    users_subscribed: "Gebruikers ingschreven:"
-    no_users_subscribed: "Geen gebruikers ingeschreven, Controleer je emailadres nog een keer."
     current_recipients: "Huidige ontvangers"
     unsubscribing: "Uitschrijven..." # {change}
     subscribe_prepaid: "Klik op inschrijven om een prepaidcode te gebruiken."
@@ -502,8 +468,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     javascript_blurb: "De taal van het web. (Niet hetzelfde als Java!)"
     coffeescript_blurb: "JavaScript, met betere syntax."
     clojure_blurb: "Lisp, maar modern."
-#    lua_blurb: "Game scripting language."
-#    io_blurb: "Simple but obscure."
+    lua_blurb: "Game scripting taal."
+    io_blurb: "Simpel maar obscuur."
     status: "Status"
     hero_type: "Soort"
     weapons: "Wapens"
@@ -514,16 +480,16 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     health: "Gezondheid"
     speed: "Snelheid"
     regeneration: "Herstel"
-#    range: "Range" # As in "attack or visual range"
-#    blocks: "Blocks" # As in "this shield blocks this much damage"
+    range: "Bereik" # As in "attack or visual range"
+    blocks: "Blokkeert" # As in "this shield blocks this much damage"
 #    backstab: "Backstab" # As in "this dagger does this much backstab damage"
     skills: "Vaardigheden"
-#    attack_1: "Deals"
-#    attack_2: "of listed"
-#    attack_3: "weapon damage."
+#   attack_1: "brengt [x damge] toe" # In Dutch we say 'brings [x damge] to...' Alternative: 'veroorzaakt [x damage] (causes [x damage])
+#    attack_2: "of listed" # what is the context?
+    attack_3: "Wapen schade."
 #    health_1: "Gains"
 #    health_2: "of listed"
-#    health_3: "armor health."
+    health_3: "pantser gezondheid."
     speed_1: "Beweegt met"
     speed_2: "meter per seconde."
     available_for_purchase: "Aanschafbaar" # Shows up when you have unlocked, but not purchased, a hero in the hero store
@@ -536,18 +502,18 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     action: "Actie"
     spell: "toverspreuk"
     action_name: "naam"
-#    action_cooldown: "Takes"
-#    action_specific_cooldown: "Cooldown"
-#    action_damage: "Damage"
-#    action_range: "Range"
+    action_cooldown: "Duurt" # As in duration
+    action_specific_cooldown: "Afkoeling" # This literally means cooldown/coolingdown. If it needs to include a time element, it should be 'afkoeltijd'.
+    action_damage: "Schade"
+    action_range: "Bereik"
     action_radius: "Straal"
     action_duration: "Tijd"
     example: "Voorbeeld"
-    ex: "bv" # Abbreviation of "example"
+    ex: "bv." # Abbreviation of "example"
     current_value: "Huidige waarde"
     default_value: "Standaard waarde"
     parameters: "Parameters"
-#    returns: "Returns"
+#    returns: "Returns" 
     granted_by: "Verleend door"
 
   save_load:
@@ -596,98 +562,53 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     michael_blurb: "Systeembeheerder"
     matt_title: "Programmeur" # {change}
     matt_blurb: "Fietser"
-#    cat_title: "Chief Artisan"
+    cat_title: "Hoofd Ambachtsman"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
-#    josh_blurb: "Floor Is Lava"
+    josh_title: "Game Designer" # In Dutch people would use the english term.
+    josh_blurb: "Vloer Is Lava"
     jose_title: "Muziek"
 #    jose_blurb: "Taking Off"
     retrostyle_title: "Illustraties"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
-#    rob_blurb: "Codes things and stuff"
-#    josh_c_title: "Game Designer"
-#    josh_c_blurb: "Designs games"
-#    carlos_title: "Region Manager, Brazil"
-#    carlos_blurb: "Celery Man"
+    retrostyle_blurb: "RetroStijl Games"
+    rob_title: "Compiler Ontwerper"
+    rob_blurb: "Programmeert dingen en spullen"
+    josh_c_title: "Game Designer"
+    josh_c_blurb: "Ontwikkeld games"
+    carlos_title: "Regio Manager, Brazilië"
+    carlos_blurb: "Selderij Man"
+    maka_title: "Klanten Ombudsman"
+    maka_blurb: "VerhalenVerteller"
 
   teachers:
-    more_info: "Info voor Leerkrachten"
-    intro_1: "CodeCombat is een online spel dat onderwijst in programmeren. Leerlingen schrijven code in echte programmeertalen."
-    intro_2: "Geen ervaring nodig!"
-    free_title: "Hoeveel kost het?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "Er zijn meer dan 110 GRATIS levels, welke alle concepten omvatten."
-    free_2: "Een maandelijkse inschrijving bied toegang tot video tutorials en extra oefenlevels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Leerkrachten krijgen een gratis abonnement!" # {change}
-    teacher_subs_0: "Wij bieden gratis inschrijvingen aan leerkrachten voor evaluatiedoeleinden." # {change}
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-    monitor_progress_title: "Hoe bekijk ik de voortgang van de leerlingen?"
-    monitor_progress_1: "De voortgang van leerlingen kunnen worden gevolg door het maken van een"
-    monitor_progress_2: "voor je klas."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-    monitor_progress_4: "pagina."
-    monitor_progress_5: "Nadat ze zijn aangesloten, ziet u een samenvatting van de leerlingen op uw Clan's pagina."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-    private_clans_3: "."
     who_for_title: "Voor wie is CodeCombat?"
-    who_for_1: "We raden CodeCombat aan voor leerlingen vanaf 9 jaar. Er is geen programmeerevaring nodig."
-    who_for_2: "We hebben CodeCombat zo gemaakt dat het leuk is vooi jongens en meiden."
-    material_title: "Hoeveel materiaal is er?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-    material_1: "ongeveer 25 uur gratis en 15 uur betaalde inhoud."
-    concepts_title: "Welke onderwerpen worden behandeld?"
-    how_much_title: "Hoeveel kost een maadelijkse inschrijving?"
-    how_much_1: "Een"
-    how_much_2: "maandelijkse inschrijving"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-    how_much_4: "Daarnaast bieden we groepskortingen voor grotere groepen:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-    how_much_6: "voor meer details."
+    who_for_1: "We raden CodeCombat aan voor leerlingen vanaf 9 jaar. Er is geen programmeerervaring nodig." # {change}
+    who_for_2: "We hebben CodeCombat zo gemaakt dat het leuk is voor jongens en meiden." # {change}
     more_info_title: "Waar kan ik meer informatie vinden?"
     more_info_1: "ons"
     more_info_2: "lerarenforum"
     more_info_3: "Het is een goede plek om contact te leggen met andere leerkrachten, die CodeCombat gebruiken."
-    sys_requirements_title: "Systeem Requirements"
-    sys_requirements_1: "Een moderne webbrowser. Een nieuwe versie van Chrome, Firefox, of Safari. Internet Explorer 9 of later."
-    sys_requirements_2: "CodeCombat ondersteunt de iPad nog niet."
 
   teachers_survey:
-#    title: "Teacher Survey"
+    title: "Leraren enquête"
     must_be_logged: "Je moet eerst ingelogd zijn. Maak een account aan of log in in het menu hierboven."
     retrieving: "Informatie ophalen..."
     being_reviewed_1: "Je aanvraag voor een gratis proefabonnement wordt" # {change}
     being_reviewed_2: "beoordeeld."
     approved_1: "Je aanvraag voor een gratis proefabonnement is" # {change}
     approved_2: "goedgekeurd." # {change}
-#    approved_4: "You can now enroll your students on the"
-#    approved_5: "courses"
-#    approved_6: "page."
+    approved_4: "U kunt nu uw leerlingen inschrijven voor"
+    approved_5: "lessen"
+    approved_6: "pagina."
     denied_1: "Uw aanvraag voor een testaccount is" # {change}
     denied_2: "afgewezen."
     contact_1: "Neem contact op"
     contact_2: "als u meer vragen heeft."
     description_1: "We bieden gratis abbonnementen aan, aan leerkrachten voor evaluatiedoeleinden. Meer informatie kan worden gevonden op onze"
-#    description_1b: "You can find more information on our"
+    description_1b: "U kunt meer informatie vinden op onze"
     description_2: "leerkrachten"
     description_3: "pagina."
     description_4: "Vul alstublieft onze korte vragenlijst in en we zullen u instructies sturen om te beginnen."
-    email: "Emailadres"
+    email: "E-mailadres"
     school: "schoolnaam"
     location: "stad of dorp"
     age_students: "Hoe oud zijn uw leerlingen?"
@@ -696,87 +617,80 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     amount_students: "Hoeveel leerlingen geeft u les?"
     hear_about: "Hoe hoorde u over CodeCombat?"
     fill_fields: "Vul alstublieft alle velden in."
-    thanks: "Dank u wel! We verzenden u binnenkort instructies."
+    thanks: "Dank u wel! We verzenden u spoedig instructies."
 
   versions:
     save_version_title: "Nieuwe versie opslaan"
-    new_major_version: "Nieuwe hoofd versie"
-#    submitting_patch: "Submitting Patch..."
+    new_major_version: "Nieuwe hoofdversie"
+    submitting_patch: "Aanpassing wordt Ingediend..."
     cla_prefix: "Om bewerkingen op te slaan, moet je eerst akkoord gaan met onze"
     cla_url: "CLA"
     cla_suffix: "."
     cla_agree: "IK GA AKKOORD"
-#    owner_approve: "An owner will need to approve it before your changes will become visible."
+    owner_approve: "Een eigenaar moet eerst akkoord gaan, daarna worden je aanpassingen zichtbaar."
 
   contact:
     contact_us: "Contact opnemen met CodeCombat"
     welcome: "Goed om van je te horen! Gebruik dit formulier om ons een e-mail te sturen."
-    forum_prefix: "Voor iets publiekelijks, probeer dan "
+    forum_prefix: "Voor algemene zaken, probeer dan "
     forum_page: "ons forum"
     forum_suffix: "."
     faq_prefix: "Er is ook een"
-    faq: "veelgestelde vragen sectie"
+    faq: "veelgestelde vragen afdeling"
     subscribe_prefix: "Als je hulp nodig hebt om een level te halen, overweeg dan alsjeblieft"
     subscribe: "abonnee te worden van CodeCombat"
     subscribe_suffix: ", dan helpen we je graag om je code te verbeteren."
-    subscriber_support: "Omdat je geabonneerd bent op CodeCombat, krijgt je email prioriteit bij het beantwoorden."
+    subscriber_support: "Omdat je geabonneerd bent op CodeCombat, krijgt je e-mail prioriteit bij het beantwoorden."
     screenshot_included: "Screenshot inbegrepen."
     where_reply: "Waar moeten we reageren?"
     send: "Feedback Verzonden"
-    contact_candidate: "Contacteer Kandidaat" # Deprecated
-    recruitment_reminder: "Gebruik dit formulier om kandidaten te contacteren voor wie je een interesse hebt om te interviewen. Vergeet niet dat CodeCombat een honorarium vraagt van 18% op het eerste-jaarssalaris. Dit honorarium moet betaald worden als de kandidaat wordt aangenomen en kon tot na 90 dagen terugbetaald worden als deze ontslagen wordt in deze periode. Deeltijds-, contract- en thuiswerkers worden van dit honorarium vrijgesteld, alsook interims." # Deprecated
 
   account_settings:
-    title: "Account Instellingen"
+    title: "Accountinstellingen"
     not_logged_in: "Log in of maak een account aan om je instellingen aan te passen."
     autosave: "Aanpassingen Automatisch Opgeslagen"
     me_tab: "Ik"
     picture_tab: "Afbeelding"
     delete_account_tab: "Verwijder je Account"
-    wrong_email: "Verkeerd Emailadres"
+    wrong_email: "Verkeerd E-mailadres"
     wrong_password: "Verkeerd wachtwoord"
     upload_picture: "Je afbeelding opsturen"
     delete_this_account: "Verwijder dit account voor altijd"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
-#    god_mode: "God Mode"
+    reset_progress_tab: "Reset Alle Voortgang"
+    reset_your_progress: "Verwijder alle voortgang en start opnieuw"
+    god_mode: "God Modus"
     password_tab: "Wachtwoord"
-    emails_tab: "Emails"
-    admin: "Administrator"
-#    manage_subscription: "Click here to manage your subscription."
+    emails_tab: "E-mails"
+    admin: "Beheerder"
+    manage_subscription: "Klik hier om je abonnement te beheren."
     new_password: "Nieuw Wachtwoord"
-    new_password_verify: "Verifieer"
-    type_in_email: "Typ je email in om de verwijdering te bevestigen."
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
+    new_password_verify: "Controleer" # Controleer means 'check'. Verifieer also means check, but it is very formal. Children wouldn't know what it means.
+    type_in_email: "Typ je e-mail in om de verwijdering te bevestigen."
+    type_in_email_progress: "Vul je e-mail in om te bevestigen dat je jouw voortgang wilt verwijderen."
     type_in_password: "Typ ook je wachtwoord in."
-    email_subscriptions: "Email Abonnementen"
-    email_subscriptions_none: "Geen Email Abonnementen."
+    email_subscriptions: "E-mail Abonnementen"
+    email_subscriptions_none: "Geen E-mail Abonnementen."
     email_announcements: "Aankondigingen"
-    email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat."
+    email_announcements_description: "Ontvang e-mails over het laatste nieuws en de ontwikkelingen bij CodeCombat." 
     email_notifications: "Notificaties"
     email_notifications_summary: "Instellingen voor gepersonaliseerde, automatische meldingen via e-mail omtrent je activiteit op CodeCombat."
     email_any_notes: "Alle Meldingen"
-    email_any_notes_description: "Zet alle activiteit-meldingen via email af."
+    email_any_notes_description: "Zet alle activiteit-meldingen via e-mail uit."
     email_news: "Nieuws"
     email_recruit_notes: "Job Aanbiedingen"
-    email_recruit_notes_description: "Als je zeer goed speelt, zouden we je wel eens kunnen contacteren om je een (betere) job aan te bieden."
-    contributor_emails: "Medewerker Klasse emails"
+    email_recruit_notes_description: "Als je zeer goed speelt, zouden we je wel eens kunnen contacteren om je een (betere) baan aan te bieden."
+    contributor_emails: "Medewerker Klasse e-mails"
     contribute_prefix: "We zoeken mensen om met ons te komen feesten! Bekijk de "
     contribute_page: "bijdragepagina"
     contribute_suffix: " om meer te weten te komen."
     email_toggle: "Vink alles aan/af"
-    error_saving: "Fout Tijdens Het Opslaan"
+    error_saving: "Fout Tijdens Opslaan"
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
     password_repeat: "Herhaal je wachtwoord."
-    job_profile: "Job Profiel" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Jouw job profiel werd goedgekeurd door CodeCombat. Werkgevers zullen het kunnen bekijken totdat je het inactief zet of als er geen verandering in komt voor vier weken."
-    job_profile_explanation: "Hey! Vul dit in en we zullen je contacteren om je een job als softwareontwikkelaar te helpen vinden."
-    sample_profile: "Bekijk een voorbeeld kandidaat-profiel"
-    view_profile: "Bekijk je eigen kandidaat-profiel"
 
   keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
+    keyboard_shortcuts: "Toetsenboord sneltoetsen"
     space: "Spatie"
     enter: "Enter"
     press_enter: "toets enter"
@@ -790,59 +704,60 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    scrub_playback: "Scrub back and forward through time."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
 #    scrub_execution: "Scrub through current spell execution."
-#    toggle_debug: "Toggle debug display."
-#    toggle_grid: "Toggle grid overlay."
-#    toggle_pathfinding: "Toggle pathfinding overlay."
-#    beautify: "Beautify your code by standardizing its formatting."
-#    maximize_editor: "Maximize/minimize code editor."
+    toggle_debug: "Toggle debug display." # This already is correct Dutch.
+    toggle_grid: "Toggle rooster weergave."
+    toggle_pathfinding: "Toggle padvind weergave."
+    beautify: "Verfraai je code door de opmaak overal gelijk te maken."
+    maximize_editor: "Maximaliseer/minimaliseer code editor."
 
   community:
     main_title: "CodeCombat Gemeenschap"
-    introduction: "`Kijk hieronder hoe je mee kunt doen en kies wat je leuk lijkt. Wek kijken er naar uit om samen te werken!"
+    introduction: "`Kijk hieronder hoe je mee kunt doen en kies wat jouw leuk lijkt. Wij kijken er naar uit om samen te werken!"
     level_editor_prefix: "Gebruik CodeCombat"
-    level_editor_suffix: "om levels te bekijken en te bewerken. Gebruikers hebben levels gemaakt voor hun klas, vrienden, hackathons, leerlingen en familie. Als een nieuw level maken te moeilijk lijkt,  kun je beginnen met het forken van een van onze levels!"
-#    thang_editor_prefix: "We call units within the game 'thangs'. Use the"
-#    thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites."
+    level_editor_suffix: "om levels te bekijken en te bewerken. Gebruikers hebben levels gemaakt voor hun klas, vrienden, hackathons, leerlingen en familie. Als een nieuw level maken te moeilijk lijkt, kun je beginnen met het forken van een van onze levels!"
+    thang_editor_prefix: "We noemen units in dit spel 'thangs'. Gebruik de"
+    thang_editor_suffix: "Om de CodeCombat bron illustraties aan te passen. Om units projectielen te laten gooien, de richting van een animatie aan te passen, een unit's levenspunten aan te passen, of je eigen vector sprites te uploaden."
     article_editor_prefix: "Zie je een fout in een van onze documenten? Wil je instructies maken voor je eigen creatie? Ga naar de"
     article_editor_suffix: "en help CodeCombat spelers meer uit hun speeltijd te halen."
     find_us: "vind ons op de volgende sites:"
     social_github: "Bekijk al onze code op GitHub"
     social_blog: "Lees onze blog op Sett"
-    social_discource: "Doe mee met discussies op onze Discourse forum"
+    social_discource: "Doe mee aan discussies op ons Discourse forum"
     social_facebook: "Like CodeCombat op Facebook"
     social_twitter: "Volg CodeCombat op Twitter"
     social_gplus: "Join CodeCombat op Google+"
-    social_hipchat: "Chat met ons in de publieke CodeCombat Slack channel"
+    social_hipchat: "Chat met ons in het openbare CodeCombat Slack channel"
     contribute_to_the_project: "Help mee met het project"
 
   clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-    private_preview: "Preview"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
+    clan: "Clan"
+    clans: "Clans"
+    new_name: "Nieuwe clan naam"
+    new_description: "Nieuwe clan beschrijving"
+    make_private: "Maak clan besloten"
+    subs_only: "Alleen voor abonnees"
+    create_clan: "Maak Nieuwe Clan"
+    private_preview: "Voorvertoning"
+    private_clans: "Besloten Clans"
+    public_clans: "Openbare Clans"
+    my_clans: "Mijn Clans"
+    clan_name: "Clan Naam"
     name: "Naam"
-#    chieftain: "Chieftain"
+    chieftain: "Stamhoofd"
     type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
+    edit_clan_name: "Bewerk Clan Naam"
+    edit_clan_description: "Bewerk Clan Beschrijving"
     edit_name: "bewerk naam"
     edit_description: "bewerk beschrijving"
-    private: "(privé)"
+    private: "(besloten)"
     summary: "Samenvatting"
-    average_level: "Gemiddelde Level"
-#    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
+    average_level: "Gemiddeld niveau"
+    average_achievements: "Gemiddelde Prestaties"
+    delete_clan: "Delete Clan"
+    leave_clan: "Verlaat Clan"
+    join_clan: "Ga bij een Clan" # Now it says 'join a clan', like: "click here to join a clan". If the context is more like: join THIS clan. Then the current translation is wrong.
     invite_1: "Uitnodigen:"
-#    invite_2: "*Invite players to this Clan by sending them this link."
+    invite_2: "*Nodig spelers uit in deze clan door hen deze link te sturen."
     members: "Leden"
     progress: "Voortgang"
     not_started_1: "Niet gestart"
@@ -855,38 +770,38 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     started_2: "Gestart"
     not_started_2: "Niet gestart"
     view_solution: "Klik om oplossing te bekijken."
-#    view_attempt: "Click to view attempt."
-#    latest_achievement: "Latest Achievement"
+    view_attempt: "Klik om poging te bekijken."
+    latest_achievement: "Laatst behaalde prestatie"
     playtime: "Speeltijd"
     last_played: "Laatst gespeeld"
 #    leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
-#    track_concepts1: "Track concepts"
+    track_concepts1: "Traject concepten"
 #    track_concepts2a: "learned by each student"
 #    track_concepts2b: "learned by each member"
 #    track_concepts3a: "Track levels completed for each student"
 #    track_concepts3b: "Track levels completed for each member"
-#    track_concepts4a: "See your students'"
-#    track_concepts4b: "See your members'"
-#    track_concepts5: "solutions"
-#    track_concepts6a: "Sort students by name or progress"
-#    track_concepts6b: "Sort members by name or progress"
-#    track_concepts7: "Requires invitation"
-#    track_concepts8: "to join"
-#    private_require_sub: "Private clans require a subscription to create or join."
+    track_concepts4a: "Zie jouw leerlingen'"
+    track_concepts4b: "Zie jouw deelnemers'"
+    track_concepts5: "Oplossingen"
+    track_concepts6a: "Sorteer leerlingen op naam of voortgang"
+    track_concepts6b: "Sorteer deelnemers op naam of voortgang"
+    track_concepts7: "Vereist een uitnodiging"
+    track_concepts8: "om deel te nemen"
+    private_require_sub: "Om aan besloten clans deel te kunnen nemen is een abonnement vereist."
 
   courses:
     course: "Cursus"
     courses: "cursussen"
-#    create_new_class: "Create New Class"
+    create_new_class: "Maak Nieuwe Klas aan"
     not_enrolled: "Je bent niet ingeschreven voor deze cursus."
     visit_pref: "Ga naar"
     visit_suf: "de pagina om in te schrijven."
-    select_class: "Selecteer een vn je klassen"
+    select_class: "Selecteer een van je klassen"
     unnamed: "Naamloos*"
     select: "Selecteer"
     unnamed_class: "Naamloze klas"
-#    edit_settings: "edit class settings"
-#    edit_settings1: "Edit Class Settings"
+    edit_settings: "bewerk klas instellingen"
+    edit_settings1: "Bewerk Klas Instellingen"
     progress: "klas-voortgang"
     add_students: "Voeg leerlingen toe"
     stats: "Statistieken"
@@ -895,8 +810,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     total_time: "Totale speeltijd:"
     average_levels: "Gemiddeld aantal levels voltooid:"
     total_levels: "Totaal aantal levels voltooid:"
-    furthest_level: "Hoogste level behaald:"
-    concepts_covered: "Concepten behandeld"
+    furthest_level: "Hoogst behaalde level:"
+    concepts_covered: "Behandelde concepten"
     students: "leerlingen"
     students1: "leerlingen"
     concepts: "Concepten"
@@ -905,11 +820,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     play_time: "speeltijd:"
     completed: "voltooid:"
     invite_students: "Nodig leerlingen uit voor deze klas."
-#    invite_link_header: "Link to join course"
-#    invite_link_p_1: "Give this link to students you would like to have join the course."
-#    invite_link_p_2: "Or have us email them directly:"
-#    capacity_used: "Course slots used:"
-    enter_emails: "Voer emailadres van leerlingen in om uit te nodigen, een per regel"
+    invite_link_header: "Link om aan cursus deel te nemen"
+    invite_link_p_1: "Geef deze link aan leerlingen waarvan u wilt dat zij de cursus volgen."
+    invite_link_p_2: "Of laat ons hun direct een e-mail sturen:"
+    capacity_used: "Cursus stoelen gebruikt:"
+    enter_emails: "Voer e-mailadressen van leerlingen in om uit te nodigen, één per regel"
     send_invites: "Verstuur uitnodigingen"
     title: "Titel"
     description: "beschrijving"
@@ -921,39 +836,39 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     select_all_courses: "Selecteer 'Alle cursussen' voor 50% korting!"
     all_courses: "Alle cursussen"
     number_students: "Aantal leerlingen"
-    enter_number_students: "Voer het aantal leerlingen in die je voor de klas nodig hebt."
+    enter_number_students: "Voer het aantal leerlingen in dat je voor de klas nodig hebt."
     name_class: "Geef je klas een naam"
     displayed_course_page: "Dit wordt getoond op de cursuspagina aan u en uw leerlingen. Het kan later worden veranderd."
     buy: "Kopen"
     purchasing_for: "U koopt een licentie voor"
     creating_for: "U maakt een klas voor"
     for: "voor" # Like in 'for 30 students'
-#    receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
+    receive_code: "Naderhand ontvangt u een ontgrendelcode om uw leerlingen, waarmee zij zich kunnen inschrijven in uw klas."
     free_trial: "Gratis uitproberen voor leerkrachten!"
     get_access: "Individueel toegang krijgen voor evaluatiedoeleinden."
     questions: "Vragen?"
     teachers_click: "Leerkrachten klik hier"
     students_click: "Leerlingen klik hier"
     courses_on_coco: "Cursussen van CodeCombat"
-    designed_to: "Cursussen zijn ontwikkeld om te introduceren in informaticaconcepten met CodeCombat's plezier en interessante omgevingen. CodeCombat levels zijn gesturctureerd rond belangrijke onderwerpen om voorstrevend leren te bemoedigen, gedurende 5 uur."
+    designed_to: "Cursussen zijn ontwikkeld ter introductie van ICT-concepten met CodeCombats leuke en leerzame omgevingen. CodeCombat-levels zijn gesturctureerd rond belangrijke concepten om vooruitstrevend leren te bemoedigen, gedurende 5 uur."
     more_in_less: "Leer meer in minder tijd"
     no_experience: "Geen programmeerervaring nodig"
     easy_monitor: "voortgang leerlingen makkelijk te bekijken"
     purchase_for_class: "Koop een cursus voor de hele klas. Het is makkelijk je leerlingen in te schrijven!"
     see_the: "Bekijk de"
     more_info: "voor meer informatie."
-    choose_course: "Kies je cursus:"
+    choose_course: "Kies uw cursus:"
     enter_code: "voer een ontgrendelcode in" # {change}
     enter_code1: "Voer ontgrendelcode in"
     enroll: "Inschrijven"
     pick_from_classes: "Kies uit je huidige klas"
-#    enter: "Enter"
+    enter: "Treed toe"
     or: "Of"
     topics: "Onderwerpen"
     hours_content: "uren inhoud:"
     get_free: "Ontvang een GRATIS cursus"
 #    enroll_paid: "Enroll Students in Paid Courses"
-#    you_have1: "You have"
+    you_have1: "U heeft"
 #    you_have2: "unused paid enrollments"
 #    use_one: "Use 1 paid enrollment for"
 #    use_multiple: "Use paid enrollments for the following students:"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     payments: "Betalingen"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Gekocht"
-    sale: "Verkoop"
     subscription: "abonnement"
     invoices: "Facturen"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     email_settings_url: "jouw e-mail instellingen"
     email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven."
     cost_title: "Kosten"
-    cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Auteursrechten en licenties"
     contributor_title: "Licentieovereenkomst voor vrijwilligers"
     contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     nutshell_title: "In een notendop"
     nutshell_description: "Alle middelen die wij aanbieden in de Level Editor zijn gratis te gebruiken om levels aan te maken. Wij behouden ons echter het recht voor om levels die gemaakt zijn op codecombat.com te beperken, en hier in de toekomst geld voor te vragen, moest dat ooit gebeuren."
     canonical: "De Engelse versie van dit document is de definitieve en kanonieke versie. Bij verschillen tussen vertalingen heeft de Engelse versie voorrang."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Tournamentprijzen" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     license: "licentie"
     oreilly: "ebook van je keuze"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profiel voor "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "Zoekt naar:"
-    last_updated: "Laatst aangepast:"
-    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Werk ervaring"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Opleiding"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-    our_notes: "Onze notities"
-#    remarks: "Remarks"
-    projects: "Projecten"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-    deprecation_warning_title: "Sorry, CodeCombat is werft nu geen personeel."
-    deprecation_warning: "We focussen ons op dit moment op beginnerslevels in plaats van het zoeken naar ervarem ontwikkelaars."
-    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Naam"
-    candidate_location: "Locatie"
-    candidate_looking_for: "Zoekt naar"
-    candidate_role: "Rol"
-    candidate_top_skills: "Beste vaardigheden"
-    candidate_years_experience: "Jaren ervaring"
-    candidate_last_updated: "Laatst aangepast"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     av_entities_sub_title: "Entiteiten"
     av_entities_users_url: "Gebruikers"
     av_entities_active_instances_url: "Actieve instanties"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Andere"
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index 9cfbaef15..5dceee316 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index 33a8656cc..b6b113a54 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Dla developerów" # Not currently shown on home page.
     or_ipad: "Albo ściągnij na swojego iPada"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Poziomy" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     creating: "Tworzenie konta..."
     sign_up: "Zarejestruj się"
     log_in: "Zaloguj się używając hasła"
-    social_signup: "lub zaloguj się używając konta Facebook lub G+:"
     required: "Musisz się zalogować zanim przejdziesz dalej."
     login_switch: "Masz już konto?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     incomplete: "Niekompletne"
     timed_out: "Czas minął"
     failing: "Niepowodzenie"
-    action_timeline: "Oś czasu"
-    click_to_select: "Kliknij jednostkę, by ją zaznaczyć."
     control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Dołącz do gry"
     reload: "Wczytaj ponownie"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
-  teachers:
-    more_info: "Informacja dla nauczycieli"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
+#  teachers:
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
   teachers_survey:
     title: "Ankieta dla nauczycieli"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     screenshot_included: "Dołączymy zrzuty ekranu."
     where_reply: "Gdzie mamy odpisać?"
     send: "Wyślij wiadomość"
-    contact_candidate: "Kontakt z kandydatem" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Ustawienia Konta"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     saved: "Zmiany zapisane"
     password_mismatch: "Hasła róznią się od siebie"
     password_repeat: "Powtórz swoje hasło."
-    job_profile: "Profil zatrudnienia" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Twój profil zatrudnienia został zaakceptowany przez CodeCombat. Pracodawcy będą mogli go widzieć dopóki nie oznaczysz go jako nieaktywny lub nie będzie on zmieniany przez 4 tygodnie."
-    job_profile_explanation: "Witaj! Wypełnij to, a będziemy w kontakcie w sprawie znalezienie dla Ciebe pracy twórcy oprogramowania."
-    sample_profile: "Zobacz przykładowy profil"
-    view_profile: "Zobacz swój profil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Skróty klawiszowe"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     subs_only: "tylko subskrybenci"
     create_clan: "Stwórz nowy klan"
     private_preview: "Podgląd"
+#    private_clans: "Private Clans"
     public_clans: "Publiczne klany"
     my_clans: "Moje klany"
     clan_name: "Nazwa klanu"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     payments: "Płatności"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Zakupiono"
-#    sale: "Sale"
     subscription: "Subskrypcje"
     invoices: "Faktury"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     email_settings_url: "twoje ustawienia e-mail"
     email_description_suffix: "lub poprzez linki w e-mailach, które wysyłamy, możesz zmienić swoje ustawienia i w prosty sposób wypisać się z subskrypcji w dowolnym momencie."
     cost_title: "Koszty"
-    cost_description: "W tym momencie CodeCombat jest w stu procentach darmowe! Jednym z naszych głównych celów jest, by utrzymać taki stan rzeczy, aby jak najwięcej ludzi miało dostęp do gry, bez względu na ich zasobność. Jeśli nadejdą gorsze dni, dopuszczamy możliwość wprowadzenia płatnych subskrypcji lub pobierania opłat za część zawartości, ale wolelibyśmy, by tak się nie stało. Przy odrobinie szczęścia, uda nam się podtrzymać obecną sytuację dzięki:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Prawa autorskie i licencje"
     contributor_title: "Umowa licencyjna dla współtwórców (CLA)"
     contributor_description_prefix: "Wszyscy współtwórcy, zarówno ci ze strony jak i ci z GitHuba, podlegają naszemu"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     nutshell_title: "W skrócie"
     nutshell_description: "Wszelkie zasoby, które dostarczamy w Edytorze Poziomów są darmowe w użyciu w jakikolwiek sposób w celu tworzenia poziomów. Jednocześnie, zastrzegamy sobie prawo do ograniczenia rozpowszechniania poziomów (stworzonych przez codecombat.com) jako takich, aby mogła być za nie w przyszłości pobierana opłata, jeśli dojdzie do takiej konieczności."
     canonical: "Angielska wersja tego dokumentu jest ostateczna, kanoniczną wersją. Jeśli zachodzą jakieś rozbieżności pomiędzy tłumaczeniami, dokument anglojęzyczny ma pierwszeństwo."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-    settings: "Ustawienia" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Edytuj Profil"
-    done_editing: "Edycja wykonana"
-    profile_for_prefix: "Profil "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-    contact: "Kontakt"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-    next: "Nastepny"
-    next_city: "miasto?"
-    next_country: "wybierz kraj."
-    next_name: "imię?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     av_entities_sub_title: "Podmioty"
     av_entities_users_url: "Użytkownicy"
     av_entities_active_instances_url: "Aktywne podmioty"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Inne"
     av_other_debug_base_url: "Baza (do debuggingu base.jade)"
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index b6dc06b30..0c6a29815 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -4,7 +4,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     no_ie: "O CodeCombat não roda em versões mais antigas que o Internet Explorer 10. Desculpe!" # Warning that only shows up in IE8 and older
     no_mobile: "O CodeCombat não foi projetado para dispositivos móveis e pode não funcionar!" # Warning that shows up on mobile devices
     play: "Jogar" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Jogar Modo Campanha" # Shows up under big play button if you only play /courses
     old_browser: "Ops, seu navegador é muito antigo para rodar o CodeCombat. Desculpe!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Você pode tentar de qualquer forma, mas provavelmente não irá funcionar."
     ipad_browser: "Más notícias: O CodeCombat não é executado no navegador do iPad. Boas notícias: Nosso app nativo do iPad está esperando a aprovação da Apple."
@@ -13,14 +13,11 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     multiplayer: "Multijogador" # Not currently shown on home page
     for_developers: "Para Desenvolvedores" # Not currently shown on home page.
     or_ipad: "Ou baixe para iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Jogar" # The top nav bar entry where players choose which levels to play
     community: "Comunidade"
-#    courses: "Courses"
+    courses: "Cursos"
     editor: "Editor"
     blog: "Blog"
     forum: "Fórum"
@@ -55,7 +52,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 
   play:
     play_as: "Jogar Como " # Ladder page
-#    compete: "Compete!" # Course details page
+    compete: "Concorrer!" # Course details page
     spectate: "Assistir" # Ladder page
     players: "Jogadores" # Hover over a level on /play
     hours_played: "Horas jogadas" # Hover over a level on /play
@@ -78,7 +75,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     subscription_required: "Requer assinatura"
     anonymous: "Jogador Anônimo"
     level_difficulty: "Dificuldade: "
-#    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
+    play_classroom_version: "Jogue a versão de classe" # Choose a level in campaign version that you also can play in one of your courses
     campaign_beginner: "Campanha Iniciante"
     awaiting_levels_adventurer_prefix: "Nós liberamos cinco níveis por semana." # {change}
     awaiting_levels_adventurer: "Cadastre-se como um aventureiro"
@@ -86,8 +83,8 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     adjust_volume: "Ajuste o volume"
     campaign_multiplayer: "Arenas Multijogador"
     campaign_multiplayer_description: "... nas quais você programará cara-a-cara contra outros jogadores."
-#    campaign_old_multiplayer: "(Deprecated) Old Multiplayer Arenas"
-#    campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas."
+    campaign_old_multiplayer: "(Depreciado) Velhas Arenas Multijogador"
+    campaign_old_multiplayer_description: "Reliquias de uma era mais civilizada.Nenhuma simulação roda nessa antiguidade ,arenas multijogador sem heróis."
 
   share_progress_modal:
     blurb: "Você está fazendo bastante progresso! Compartilhe com alguém o quanto você já aprendeu com o CodeCombat!" # {change}
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     creating: "Criando uma nova conta..."
     sign_up: "Criar conta"
     log_in: "Entre com a senha"
-    social_signup: "Ou, você pode fazer login pelo Facebook ou G+:"
     required: "Você precisa fazer login antes de ir por esse caminho."
     login_switch: "Já possui uma conta?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "Nome da Escola e da cidade"
+    optional: "Opcional"
+    school_name_placeholder: "Escola de exemplo, Cotia, SP"
 
   recover:
     recover_account_title: "Recuperar conta"
@@ -225,10 +221,10 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     years: "anos"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "Nivel Completo:"
+    course: "Curso:"
     done: "Pronto"
-#    next_level: "Next Level:"
+    next_level: "Proximo Nivel:"
     next_game: "Próximo jogo"
     show_menu: "Mostrar menu do jogo"
     home: "Início" # Not used any more, will be removed soon.
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     incomplete: "Incompleto"
     timed_out: "Tempo esgotado"
     failing: "Falta"
-    action_timeline: "Linha do Tempo das Ações"
-    click_to_select: "Clique em um personagem para selecioná-lo."
     control_bar_multiplayer: "Multijogador"
     control_bar_join_game: "Juntar-se a uma partida"
     reload: "Recarregar"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     parents_title: "Seus filhos estão aprendendo a programar." # {change}
     parents_blurb1: "Com o CodeCombat, seus filhos aprendem a programar de verdade. Eles começam a aprender comandos simples, e progridem para tópicos avançados."
     parents_blurb1a: "Programação de computadores é uma habilidade essencial que seu filho com certeza usará quando adulto. Em 2020, conhecimentos basicos de software serão necessários para 77% dos empregos, e engenheiros de software estão em grande demanda ao redor do mundo. Você sabia que CIência da Computação é a formação superior mais bem paga?"
-    parents_blurb2: "Por apenas $9.99 USD/mês, eles recebem novos desafios todo mês e suporte no email pessoal de programadores profissionais." # {change}
+    parents_blurb2: "Por apenas ${{price}} USD/mês, eles recebem novos desafios todo mês e suporte no email pessoal de programadores profissionais." # {change}
     parents_blurb3: "Sem risco: 100% devolução do dinheiro garantida, basta um simples clique em desinscrever-se."
     payment_methods: "Formas de pagamento"
     payment_methods_title: "Formas de pagamento aceitas"
     payment_methods_blurb1: "Aceitamos cartões de crédito e Alipay no momento." # {change}
     payment_methods_blurb2: "Se você precisa de outra forma de pagamento, por favor contate"
-    sale_already_subscribed: "Você já está subscrito!"
-    sale_blurb1: "Economize $21" # {change}
-    sale_blurb2: "desconto regular de assinatura por U$120 durante um ano inteiro!"
     sale_button: "Venda!"
-    sale_button_title: "Economize $21 quando você adquirir a assinatura de 1 ano" # {change}
-    sale_click_here: "Clique Aqui"
-    sale_ends: "Termina"
-    sale_extended: "*Assinaturas existentes serão extendidas por 1 ano."
-    sale_feature_here: "O que está incluso:"
-    sale_feature2: "Acesso a 9 poderosos <strong>novos heróis</strong> com atributos únicos!"
-    sale_feature4: "<strong>42,000 gemas bônus</strong> entregues imediatamente!"
-    sale_continue: "Pronto para continuar a aventura?"
-    sale_limited_time: "Oferta por tempo limitado!"
-    sale_new_heroes: "Novos heróis!"
-    sale_title: "Promoção de volta às aulas"
-    sale_view_button: "Compre uma assinatura de 1 ano por"
+    sale_button_title: "Economize ${{discount}} quando você adquirir a assinatura de 1 ano" # {change}
     stripe_description: "Inscrição Mensal"
-    stripe_description_year_sale: "Assinatura de 1 Ano ($21 de desconto" # {change}
+    stripe_description_year_sale: "Assinatura de 1 Ano (${{discount}} de desconto" # {change}
     subscription_required_to_play: "Você precisará se inscrever para jogar este nível."
     unlock_help_videos: "Inscreva-se para desbloquear todos os vídeos tutoriais."
     personal_sub: "Inscrição individual" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     currently_free_until: "Sua assinatura gratuita é válida até"
     was_free_until: "Sua assinatura gratuita expirou em"
     managed_subs: "Assinaturas gerenciadas"
-    managed_subs_desc: "Adicione assinaturas para outros jogadores (estudantes, crianças, etc)"
-    managed_subs_desc_2: "Destinatários devem ter uma conta CodeCombat associada com o e-mail fornecido"
-    group_discounts: "Descontos para grupos"
-    group_discounts_1: "Nós também oferecemos descontos para grupos para inscrições em grande quantidades."
-    group_discounts_1st: "Primeira assinatura"
-    group_discounts_full: "Preço normal"
-    group_discounts_2nd: "2 a 11 assinaturas"
-    group_discounts_20: "20% de desconto"
-    group_discounts_12th: "Acima de 12 assinaturas"
-    group_discounts_40: "20% de desconto"
     subscribing: "Assinando..."
-    recipient_emails_placeholder: "Insira o e-mail para assinar, um por linha"
-    subscribe_users: "Inscrever usuários"
-    users_subscribed: "Usuários inscritos"
-    no_users_subscribed: "Nenhum usuário inscrito, por favor verifique os endereços de e-mail"
     current_recipients: "Destinatários atuais"
     unsubscribing: "Cancelando assinatura" # {change}
     subscribe_prepaid: "Clique em Assinar para utilizar um código pré-pago"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     josh_c_blurb: "Desenha jogos"
     carlos_title: "Gerente Regional, Brasil"
     carlos_blurb: "O Homem Célere"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Informações para Professores"
-    intro_1: "CodeCombat é um jogo online que ensina programação. Estudantes criam código em linguagens de programação usadas na vida real."
-    intro_2: "Não é necessário ter experiência!"
-    free_title: "Quanto custa?"
-    cost_premium_server: "CodeCombat é gratuito para os primeiros cinco níveis, depois disso custa $9.99 USD por mês para ter acesso aos nossos outros 190+ níveis em nossos servidores exclusivos por países."
-    free_1: "CodeCombat Basic é gratuito! Há mais de 80 níveis gratuitos que cobrem todos os conceitos." # {change}
-    free_2: "Uma assinatura mensal dá acesso aos vídeos tutoriais e mais níveis para praticar."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Professores recebem assinaturas gratuitas!" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Por favor contate" # {change}
-    teacher_subs_2: "para organizar uma assinatura mensal." # {change}
-    teacher_subs_3: "para configurar sua assinatura" # {change}
-    sub_includes_title: "O que está incluído na assinatura?"
-    sub_includes_1: "Além dos mais de 80 níveis básicos, estudantes com uma assinatura mensal têm acesso aos seguintes recursos:" # {change}
-    sub_includes_2: "Mais de 60 níveis para praticar" # {change}
-    sub_includes_3: "Vídeos tutoriais"
-    sub_includes_4: "Suporte premium por email"
-    sub_includes_5: "7 novos heróis com habilidades únicas a serem aprendidas" # {change}
-    sub_includes_6: "3500 gemas bônus todos os meses"
-    sub_includes_7: "Clãs Privados"
-    monitor_progress_title: "Como monitoro o progresso dos estudantes?"
-    monitor_progress_1: "O progresso dos estudantes pode ser monitorado ao criar"
-    monitor_progress_2: "para sua turma."
-    monitor_progress_3: "Para adicionar estudantes, envie-os o link de convite para seu clã, que está na"
-    monitor_progress_4: "página."
-    monitor_progress_5: "Depois que eles se juntarem ao seu Clã, você verá um resumo do progresso dos estudantes na página do seu Clã."
-    private_clans_1: "Clãs privados proporcionam mais pricacidade e informações de progresso detalhadas para cada estudante."
-    private_clans_2: "Para criar um Clã privado, marque a caixa 'Tornar Clã privado' ao criar um"
-    private_clans_3: "."
     who_for_title: "Para quem é indicado o CodeCombat?"
-    who_for_1: "Nós recomendamos CodeCombat para estudantes a partir de 9 anos de idade. Nenhuma experiência anterior em programação é necessária."
-    who_for_2: "Nós projetamos o CodeCombat para ser atraente à meninos e meninas."
-    material_title: "Quanto material existe?"
-    material_premium_server: "Aproximadamente 40 horas de jogo espalhadas por mais de 180 níveis restritos até agora." # {change}
-    material_1: "Aproximadamente 25 horas de conteúdo livre e 15 horas adicionais de conteúdo restrito."
-    concepts_title: "Que conceitos são abordados?"
-    how_much_title: "Quanto custa uma assinatura mensal?"
-    how_much_1: "Uma"
-    how_much_2: "assinatura mensal"
-    how_much_3: "custa $9.99, e pode ser cancelada a qualquer momento."
-    how_much_4: "Além disso, nós provemos descontos para grupos maiores:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-    how_much_6: "para mais detalhes."
+    who_for_1: "Nós recomendamos CodeCombat para estudantes a partir de 9 anos de idade. Nenhuma experiência anterior em programação é necessária." # {change}
+    who_for_2: "Nós projetamos o CodeCombat para ser atraente à meninos e meninas." # {change}
     more_info_title: "Onde eu posso encontrar mais informações?"
     more_info_1: "Nosso"
     more_info_2: "fórum de professores"
     more_info_3: "é um bom lugar para se conectar com ótimos educadores que utilizam o CodeCombat."
-    sys_requirements_title: "Requisitos de Sistema"
-    sys_requirements_1: "Pelo motivo de CodeCombat ser um jogo, é mais intenso para ser processado em computadores do que tutoriais em vídeo ou escritos. Estamos otimizando para que rode rapidamente em todos navegadores modernos e também em computadores antigos, assim todos podem jogar. Sendo assim, aqui estão as nossas sugestões para tirar o máximo proveito da experiência de CodeCombat:" # {change}
-    sys_requirements_2: "Use versões novas dos navegadores Chrome ou Firefox." # {change}
 
   teachers_survey:
     title: "Pesquisa de professor"
@@ -675,17 +596,17 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     being_reviewed_2: "revisada."
     approved_1: "Sua solicitação de teste grátis de assinatura foi" # {change}
     approved_2: "aprovada." # {change}
-#    approved_4: "You can now enroll your students on the"
-#    approved_5: "courses"
-#    approved_6: "page."
+    approved_4: "Agora você pode inscrever os seus estudantes na"
+    approved_5: "página"
+    approved_6: "cursos."
     denied_1: "Sua solicitação de teste grátis de assinatura foi" # {change}
     denied_2: "negada."
     contact_1: "Por favor, entre em contato"
     contact_2: "caso você tenha dúvidas no futuro."
     description_1: "Nós oferecemos assinaturas grátis à professores para fins de avaliação. Você pode encontrar mais informações na nossa"
-#    description_1b: "You can find more information on our"
-    description_2: "professores"
-    description_3: "página."
+    description_1b: "Você pode achar mais informações na sua "
+    description_2: "página"
+    description_3: "professores."
     description_4: "Por favor, preencha esta rápida pesquisa e nós o enviaremos as intruções de instalação por email."
     email: "Endereço de email"
     school: "Nome da Escola"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     screenshot_included: "Imagem da tela incluída."
     where_reply: "Onde devemos responder?"
     send: "Enviar opinião"
-    contact_candidate: "Contactar Candidato" # Deprecated
-    recruitment_reminder: "Utilize esse formulário para entrar em contato com candidatos que você esteja interessado em entrevistar. Lembre-se que o CodeCombat cobra 15% do salário do primeiro ano. A taxa de contratação é cobrada quando da contratação do empregado e é reembolsável por 90 dias, se o empregado não permanece no emprego. Empregados de meio-turno, remotos ou com contrato serão gratuitos como estagiários." # Deprecated
 
   account_settings:
     title: "Configurações da Conta"
@@ -743,7 +662,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     password_tab: "Senha"
     emails_tab: "Emails"
     admin: "Admin"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "Clique a aqui para administrar a sua assinatura."
     new_password: "Nova Senha"
     new_password_verify: "Confirmação"
     type_in_email: "Digite seu e-mail para confirmar a exclusão" # {change}
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     saved: "Alterações Salvas"
     password_mismatch: "As senhas não estão iguais"
     password_repeat: "Por favor repita sua senha."
-    job_profile: "Perfil de trabalho" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Seu perfil de trabalho foi aprovado pelo CodeCombat. Empregadores poderão vê-lo até que você o marque como inativo ou caso não seja alterado por quatro semanas."
-    job_profile_explanation: "Olá! Preencha tudo e iremos entrar em contato sobre encontrar um trabalho como desenvolvedor de software."
-    sample_profile: "Veja um perfil de exemplo"
-    view_profile: "Visualizar seu perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Atalhos do Teclado"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     subs_only: "Apenas para assinantes"
     create_clan: "Criar novo clã"
     private_preview: "Visualizar"
+#    private_clans: "Private Clans"
     public_clans: "Clãs Públicos"
     my_clans: "Meus Clãs"
     clan_name: "Nome do Clã"
@@ -855,7 +770,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     started_2: "Iniciado"
     not_started_2: "Não Iniciado"
     view_solution: "Clique para ver a solução."
-#    view_attempt: "Click to view attempt."
+    view_attempt: "Clique para ver a tentativa."
     latest_achievement: "Última Conquista"
     playtime: "Tempo de Jogo"
     last_played: "Último Jogo"
@@ -877,7 +792,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
   courses:
     course: "Curso"
     courses: "cursos"
-#    create_new_class: "Create New Class"
+    create_new_class: "Criar nova classe"
     not_enrolled: "Você não está matriculado nesse curso."
     visit_pref: "Por gentileza, visite a"
     visit_suf: "página para matricular-se."
@@ -899,35 +814,35 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     concepts_covered: "Conceitos Abordados"
     students: "Estudantes"
     students1: "estudantes"
-#    concepts: "Concepts"
-#    levels: "levels"
-#    played: "Played"
-#    play_time: "Play time:"
-#    completed: "Completed:"
-#    invite_students: "Invite students to join this class."
-#    invite_link_header: "Link to join course"
-#    invite_link_p_1: "Give this link to students you would like to have join the course."
-#    invite_link_p_2: "Or have us email them directly:"
-#    capacity_used: "Course slots used:"
-#    enter_emails: "Enter student emails to invite, one per line"
-#    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
-#    creating_class: "Creating class..."
-#    purchasing_course: "Purchasing course..."
-#    buy_course: "Buy Course"
-#    buy_course1: "Buy this course"
-#    create_class: "Create Class"
-#    select_all_courses: "Select 'All Courses' for a 50% discount!"
-#    all_courses: "All Courses"
-#    number_students: "Number of students"
-#    enter_number_students: "Enter the number of students you need for this class."
-#    name_class: "Name your class"
-#    displayed_course_page: "This will be displayed on the course page for you and your students. It can be changed later."
-#    buy: "Buy"
-#    purchasing_for: "You are purchasing a license for"
-#    creating_for: "You are creating a class for"
-#    for: "for" # Like in 'for 30 students'
+    concepts: "Conceitos"
+    levels: "Níveis"
+    played: "Jogado"
+    play_time: "Tempo de jogo:"
+    completed: "Completado:"
+    invite_students: "Convidar estudantes para se juntar a classe."
+    invite_link_header: "Link para se juntar ao curso"
+    invite_link_p_1: "Dê esse link para os estudantes que você queira que se junte ao curso."
+    invite_link_p_2: "Ou mande um e-mail a eles:"
+    capacity_used: "Espaço de curso usado:"
+    enter_emails: "Insira os e-mails dos estudantes , um por linha"
+    send_invites: "Enviar convites"
+    title: "Título"
+    description: "Descrição"
+    creating_class: "Criando classe..."
+    purchasing_course: "Comprando curso..."
+    buy_course: "Comprar curso"
+    buy_course1: "Compre esse curos"
+    create_class: "Criar Classe"
+    select_all_courses: "Selecione 'Todos os Cursos' para ter um desconto de 50%!"
+    all_courses: "Todos os Cursos"
+    number_students: "Número de estudantes"
+    enter_number_students: "Insira o número de estudantes que você precissa para essa classe."
+    name_class: "Nomeie sua Classe"
+    displayed_course_page: "Isso vai ser mostrado na pagina do curso para você e seus estudantes.Pode ser mudado mais tarde."
+    buy: "Comprar"
+    purchasing_for: "Você esta comprando uma licensa para"
+    creating_for: "Você esta criando uma classe para"
+    for: "para" # Like in 'for 30 students'
 #    receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
 #    free_trial: "Free trial for teachers!"
 #    get_access: "to get individual access to all courses for evalutaion purposes."
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     payments: "Pagamentos"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Comprado"
-    sale: "Vender"
     subscription: "Assinatura"
     invoices: "Faturas"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     email_settings_url: "das suas configurações de email"
     email_description_suffix: "ou através de links nos emails que enviarmos, você pode trocar as preferências e facilmente se desinscrever a qualquer hora."
     cost_title: "Custo"
-    cost_description: "Atualmente o CodeCombat é 100% grátis. Um dos nossos principais objetivos é mantê-lo dessa forma, para que, o maior número possível de pessoas possa jogar, independente de seu lugar na vida. Se o céu escurecer, nós poderemos ter que cobrar uma assinatura, ou por algum conteúdo, mas preferimos que não. Com alguma sorte, nós seremos capazes de manter a empresa com:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Direitos Autorais e Licenças"
     contributor_title: "Contrato de Licença de Colaborador"
     contributor_description_prefix: "Todos os colaboradores, tanto no nosso site quando no nosso repositório no GitHub estão sujeitos ao nosso"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     nutshell_title: "Em poucas palavras"
     nutshell_description: "Todos os recursos que oferecemos no Editor de Níveis é livre para usar como quiser para a criação de níveis. Mas nós nos reservamos o direito de restringir a distribuição dos próprios níveis (que são criados em codecombat.com) para que possam ser cobrados no futuro, se é que isso precise acontecer."
     canonical: "A versão em inglês deste documento é a versão canônica definitiva. Se houver discrepâncias entre traduções, o documento em inglês tem precedência."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Prêmios do Torneio" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     license: "licença"
     oreilly: "ebook de sua escolha"
 
-  account_profile:
-    settings: "Configurações" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Edite seu perfil"
-    done_editing: "Edição Feita"
-    profile_for_prefix: "Perfil de "
-    profile_for_suffix: ""
-    featured: "Disponível"
-    not_featured: "Não disponível"
-    looking_for: "Procurando por:"
-    last_updated: "Última atualização:"
-    contact: "Contato"
-    active: "Procurando por entrevistas de emprego no momento"
-    inactive: "Não está procurando por oportunidades no momento"
-    complete: "Completo"
-    next: "Próximo"
-    next_city: "Cidade?"
-    next_country: "escolha seu país."
-    next_name: "Nome?"
-    next_short_description: "escreva uma breve descrição."
-    next_long_description: "descreva o tipo de vaga ou cargo desejados."
-    next_skills: "liste pelo menos cinco habilidades."
-    next_work: "descreva seu histórico de trabalho."
-    next_education: "descreva seu percurso acadêmico."
-    next_projects: "mostre até três projetos nos quais você trabalhou."
-    next_links: "adicione links pessoais ou sociais."
-    next_photo: "adicione uma foto profissional (opcional)."
-    next_active: "marque-se como \"aberto a oportunidades\"."
-    example_blog: "Blog"
-    example_personal_site: "Site Pessoal"
-    links_header: "Links Pessoais"
-    links_blurb: "Adicione links para sites ou perfis que você gostaria de destacar, como seu GitHub, LinkedIn ou seu blog."
-    links_name: "Nome do Link"
-    links_name_help: "Para onde você está linkando?"
-    links_link_blurb: "URL do Link"
-    basics_header: "Atualizar informações básicas"
-    basics_active: "Aberto para Oportunidades"
-    basics_active_help: "Está procurando oportunidades de entrevista agora?"
-    basics_job_title: "Título do Trabalho Desejado"
-    basics_job_title_help: "Qual cargo você está procurando?"
-    basics_city: "Cidade"
-    basics_city_help: "Cidade que você quer trabalhar (ou morar)."
-    basics_country: "País"
-    basics_country_help: "País que você quer trabalhar (ou morar)."
-    basics_visa: "Status de Trabalho nos EUA"
-    basics_visa_help: "Você está autorizado a trabalhar nos EUA ou você precisa de patrocínio para o VISA? (Se você mora no Canadá ou na Austrália, marque como autorizado.)"
-    basics_looking_for: "Procurando por"
-    basics_looking_for_full_time: "Tempo integral"
-    basics_looking_for_part_time: "Meio-turno"
-    basics_looking_for_remote: "Remoto"
-    basics_looking_for_contracting: "Contratando"
-    basics_looking_for_internship: "Estágio"
-    basics_looking_for_help: "Que tipo de cargo de desenvolvendor você procura?"
-    name_header: "Preencha seu nome"
-    name_anonymous: "Desenvolvedor Anônimo"
-    name_help: "Nome que você quer que os empregadores vejam, por exemplo 'Nick Winter'."
-    short_description_header: "Escreva uma breve descrição de si mesmo"
-    short_description_blurb: "Adicione um slogan (frase) que ajudará o empregador a lhe conhecer rapidamente."
-    short_description: "Slogan"
-    short_description_help: "Quem é você e o que você está procurando? Máximo de 140 caracteres."
-    skills_header: "Habilidades"
-    skills_help: "Marque habilidades de desenvolvimento relevantes em ordem de proficiência."
-    long_description_header: "Descreva o cargo desejado"
-    long_description_blurb: "Diga aos empregadores o quão incrível você é e qual cargo você deseja."
-    long_description: "Autodescrição"
-    long_description_help: "Descreva a si mesmo para seu potencial empregador. Mantenha curto e direto. Recomendamos esboçar o cargo que mais lhe interessa. Máximo de 600 caracteres."
-    work_experience: "Experiência de Trabalho"
-    work_header: "Descreva seu histórico de trabalho"
-    work_years: "Anos de Experiência"
-    work_years_help: "Quantos anos de experiência profissional (sendo pago) de desenvolvimento de software você tem?"
-    work_blurb: "Liste experiências relevantes de trabalho. As mais recentes primeiro."
-    work_employer: "Empregador"
-    work_employer_help: "Nome do empregador."
-    work_role: "Título do Emprego"
-    work_role_help: "Qual era a sua função ou cargo no emprego?"
-    work_duration: "Duração"
-    work_duration_help: "Por quanto tempo?"
-    work_description: "Descrição"
-    work_description_help: "O que você fez lá? (140 carac; opcional)"
-    education: "Educação"
-    education_header: "Descreva seu percurso acadêmico"
-    education_blurb: "Liste seu percurso acadêmico."
-    education_school: "Escola"
-    education_school_help: "Nome da sua escola."
-    education_degree: "Grau"
-    education_degree_help: "Qual é o seu grau e área de estudo?"
-    education_duration: "Datas"
-    education_duration_help: "Quando?"
-    education_description: "Descrição"
-    education_description_help: "Destaque qualquer coisa sobre essa experiência acadêmica. (140 carac.; opcional)"
-    our_notes: "Nossas notas"
-    remarks: "Observações"
-    projects: "Projetos"
-    projects_header: "Adicione 3 projetos"
-    projects_header_2: "Projetos (Top 3)"
-    projects_blurb: "Destaque seus projetos para impressionar os empregadores."
-    project_name: "Nome do Projeto"
-    project_name_help: "Como o projeto se chama?"
-    project_description: "Descrição"
-    project_description_help: "Descreva o projeto brevemente."
-    project_picture: "Imagem"
-    project_picture_help: "Envie uma imagem com 230x115px ou maior mostrando o projeto."
-    project_link: "Link"
-    project_link_help: "Link para o projeto."
-    player_code: "Código do Jogador"
-
-  employers:
-    deprecation_warning_title: "Desculpe, o CodeCombat não está recrutando no momento."
-    deprecation_warning: "Estamos nos concentrando em níveis iniciante, em vez de encontrar desenvolvedores especializados no momento."
-    hire_developers_not_credentials: "Contrate desenvolvedores, não referências." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Comece"
-    already_screened: "Nós já selecionamos tecnicamente todos os nossos candidatos"
-    filter_further: ", mas você pode filtrar ainda mais:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizado nos EUA"
-    filter_visa_no: "Não autorizado"
-    filter_education_top: "Melhor colégio"
-    filter_education_other: "Outros"
-    filter_role_web_developer: "Desenvolvedor Web"
-    filter_role_software_developer: "Desenvolvedor de Software"
-    filter_role_mobile_developer: "Desenvolvedor Mobile"
-    filter_experience: "Experiência"
-    filter_experience_senior: "Sênior"
-    filter_experience_junior: "Júnior"
-    filter_experience_recent_grad: "Recentemente graduado"
-    filter_experience_student: "Estudante universitário"
-    filter_results: "resultados"
-    start_hiring: "Comece a contratar."
-    reasons: "Três razões para você buscar talentos através de nós:"
-    everyone_looking: "Todos aqui estão buscando por sua próxima oportunidade."
-    everyone_looking_blurb: "Esqueça sobre 20% dos índices de resposta do LinkedIn InMail. Todos que listamos neste site querem encontrar sua próxima posição e irão responder por sua solicitação de apresentação."
-    weeding: "Sente-se; nós capinamos por você."
-    weeding_blurb: "Cada jogador que nós listarmos foi devidamente filtrado por suas habilidades técnicas. Nós também fazemos contatos telefônicos para seleção de candidatos e fazemos anotações em seus perfís para economizar o seu tempo."
-    pass_screen: "Eles irão ser exibidos em sua tela técnica."
-    pass_screen_blurb: "Avalie o código de cada candidato antes de contatá-los. Um empregador descobriu que nossos desenvolvedores passaram 5x mais em seu filtro do que contratando através do Hacker News."
-    make_hiring_easier: "Faça minhas contratações mais fáceis, por favor."
-    what: "O que é CodeCombat?"
-    what_blurb: "CodeCombat é um jogo de programação multijogador que roda no navegador. Jogadores escrevem código para controlar suas forças na batalha contra outros desenvolvedores. Nossos jogadores tem experiênciacom todos os grandes stacks tecnológicos."
-    cost: "Quanto nós cobramos?"
-    cost_blurb: "Cobramos 15% do primeiro ano de salário e oferecemos garantia de 100% do dinheiro devolta por 90 dias. Não cobramos pelos candidatos que já estão sendo entrevistados na sua empresa."
-    candidate_name: "Nome"
-    candidate_location: "Localização"
-    candidate_looking_for: "Buscando por"
-    candidate_role: "Papel"
-    candidate_top_skills: "Melhores Habilidades"
-    candidate_years_experience: "Anos de Experiência"
-    candidate_last_updated: "Última Atualização"
-    candidate_who: "Quem"
-    featured_developers: "Desenvolvedores em destaque"
-    other_developers: "Outros Desenvolvedores"
-    inactive_developers: "Desenvolvedores Inativos"
-
   admin:
     av_espionage: "Espionagem" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email ou username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Usuários"
     av_entities_active_instances_url: "Instâncias Ativas"
-    av_entities_employer_list_url: "Lista de Empregadores"
-    av_entities_candidates_list_url: "Lista de Candidatos"
     av_entities_user_code_problems_list_url: "Problemas na Lista de Códigos do Usuário"
     av_other_sub_title: "Outro"
     av_other_debug_base_url: "Base (para debugar base.jade)"
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 1aaedb57c..475b8a38d 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     multiplayer: "Multijogador" # Not currently shown on home page
     for_developers: "Para Programadores" # Not currently shown on home page.
     or_ipad: "Ou descarrega para iPad"
-    hoc_class_code: "Tenho um Código de Turma"
-    hoc_enter: "Entrar"
-    hoc_title: "Hora do Código?"
 
   nav:
     play: "Níveis" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     creating: "A Criar Conta..."
     sign_up: "Registar"
     log_in: "iniciar sessão com palavra-passe"
-    social_signup: "Ou podes registar-te através do FB ou do Google+:"
     required: "Precisas de iniciar sessão antes de prosseguires."
     login_switch: "Já tens uma conta?"
     school_name: "Nome e Cidade da Escola"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     incomplete: "Incompletos"
     timed_out: "Ficaste sem tempo"
     failing: "A falhar"
-    action_timeline: "Linha do Tempo de Ações"
-    click_to_select: "Clica numa unidade para a selecionares."
     control_bar_multiplayer: "Multijogador"
     control_bar_join_game: "Entrar no Jogo"
     reload: "Recarregar"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     parents_title: "Caro Educador: O seu educando está a aprender a programar. Vai ajudá-lo a continuar?"
     parents_blurb1: "O seu educando já jogou __nLevels__ níveis e aprendeu as bases da programação. Ajude a desenvolver o interesse dele, comprando-lhe uma subscrição para que ele possa continuar a jogar."
     parents_blurb1a: "A programação de computadores é uma habilidade fundamental que o seu educando vai usar incontestavelmente quando for adulto. Em 2020, habilidades de programação básicas serão requisitadas por 77% dos empregos e, atualmente, há uma grande procura por engenheiros informáticos no mundo. Sabia que os cursos universitários ligados às Ciências da Computação são os mais bem pagos?"
-    parents_blurb2: "Por $9.99 USD/mês, o seu educando recebe novos desafios todas as semanas e suporte pessoal, via e-mail, de programadores profissionais."
+    parents_blurb2: "Por ${{price}} USD/mês, o seu educando recebe novos desafios todas as semanas e suporte pessoal, via e-mail, de programadores profissionais."
     parents_blurb3: "Sem Risco: 100% de garantia de devolução do dinheiro, com anulação fácil de 1 clique."
     payment_methods: "Métodos de Pagamento"
     payment_methods_title: "Métodos de Pagamento Aceites"
-    payment_methods_blurb1: "Atualmente aceitamos cartões de crédito e Alipay. Também podes enviar $29.97 para nick@codecombat.com com o e-mail da tua conta para adquirires uma subscrição e gemas por três meses ou $99 por um ano."
+    payment_methods_blurb1: "Atualmente aceitamos cartões de crédito e Alipay. Também podes enviar ${{three_month_price}} para nick@codecombat.com com o e-mail da tua conta para adquirires uma subscrição e gemas por três meses ou ${{year_price}} por um ano."
     payment_methods_blurb2: "Se precisares de uma outra forma de pagamento, por favor contacta"
-    sale_already_subscribed: "Já estás subscrito!"
-    sale_blurb1: "Poupa $21"
-    sale_blurb2: "do preço de uma subscrição anual normal de $120!"
     sale_button: "Promoção!"
-    sale_button_title: "Poupa $21 ao comprares uma subscrição anual"
-    sale_click_here: "Clica Aqui"
-    sale_ends: "Termina"
-    sale_extended: "*Subscrições existentes serão prolongadas um ano."
-    sale_feature_here: "Aqui está o que vais receber:"
-    sale_feature2: "Acesso a 9 <strong>heróis novos</strong> e poderosos com habilidades únicas!"
-    sale_feature4: "<strong>42,000 gemas de bónus</strong> atribuídas imediatamente!"
-    sale_continue: "Pronto para te continuares a aventurar?"
-    sale_limited_time: "Oferta por tempo limitado!"
-    sale_new_heroes: "Novos heróis!"
-    sale_title: "Promoção de Regresso às Aulas"
-    sale_view_button: "Compra uma subscrição anual por"
+    sale_button_title: "Poupa ${{discount}} ao comprares uma subscrição anual"
     stripe_description: "Subscrição Mensal"
-    stripe_description_year_sale: "Subscrição Anual ($21 desconto)"
+    stripe_description_year_sale: "Subscrição Anual (${{discount}} desconto)"
     subscription_required_to_play: "Precisas de uma subscrição para jogares este nível."
     unlock_help_videos: "Subscreve-te para desbloqueares todos os tutoriais em vídeo."
     personal_sub: "Subscrição Pessoal" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     currently_free_until: "Atualmente tens uma subscrição até"
     was_free_until: "Tinhas uma subscrição gratuita até"
     managed_subs: "Subscrições Geridas"
-    managed_subs_desc: "Adiciona subscrições para outros jogadores (estudantes, crianças, etc.)"
-    managed_subs_desc_2: "Estes jogadores devem ter uma conta do CodeCombat associada ao endereço de e-mail que forneceres."
-    group_discounts: "Descontos de grupo"
-    group_discounts_1: "Também oferecemos descontos de grupo para subscrições em massa."
-    group_discounts_1st: "1ª subscrição"
-    group_discounts_full: "Preço total"
-    group_discounts_2nd: "2ª-11ª subscrições"
-    group_discounts_20: "20% de desconto"
-    group_discounts_12th: "12ª+ subscrições"
-    group_discounts_40: "40% de desconto"
     subscribing: "A Subscrever..."
-    recipient_emails_placeholder: "Introduz endereços de e-mail para subscrever, um por linha."
-    subscribe_users: "Subscrever Utilizadores"
-    users_subscribed: "Utilizadores subscritos:"
-    no_users_subscribed: "Nenhum utilizador subscrito. Por favor, verifica os endereços de e-mail."
     current_recipients: "Beneficiários Atuais"
     unsubscribing: "A Cancelar a Subscrição"
     subscribe_prepaid: "Clica em Subscrever para usares um código pré-pago"
@@ -605,67 +571,22 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     retrostyle_title: "Ilustração"
     retrostyle_blurb: "'RetroStyle Games'"
     rob_title: "Engenheiro de Compilação"
-    rob_blurb: "Programa coisas e mais coisas"
+    rob_blurb: "Programa Muitas Coisas"
     josh_c_title: "'Designer' de Jogos"
-    josh_c_blurb: "Projeta jogos"
+    josh_c_blurb: "Projeta Jogos"
     carlos_title: "Gestor Regional, Brasil"
     carlos_blurb: "Homem do Dinheiro"
+    maka_title: "Defensor dos Clientes"
+    maka_blurb: "Contador de Histórias"
 
   teachers:
-    more_info: "Mais Informações para Professores"
-    intro_1: "O CodeCombat é um jogo 'online' que ensina programação. Os estudantes escrevem código em linguagens de programação reais."
-    intro_2: "Não é necessário ter experiência!"
-    free_title: "Quanto custa?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "Há 110+ níveis GRATUITOS que abordam cada conceito."
-    free_2: "Uma subscrição mensal dá acesso a tutoriais em vídeo e a níveis extra para praticar."
-    free_3: "O conteúdo do CodeCombat está dividido em"
-    free_4: "cursos"
-    free_5: ". O primeiro curso é gratuito e tem cerca de uma hora de material."
-    free_6: "O acesso aos cursos adicionais pode ser desbloqueado com uma compra de uma só vez."
-    teacher_subs_title: "Os professores recebem uma avaliação gratuita!"
-    teacher_subs_0: "Oferecemos avaliações gratuitas a professores."
-    teacher_subs_1: "Por favor, preenche o nosso"
-    teacher_subs_2: "Inquérito para Professores"
-    teacher_subs_3: "para experimentares os cursos pagos."
-    sub_includes_title: "O que está incluído na subscrição?"
-    sub_includes_1: "Para além dos 110+ níveis básicos, os estudantes com uma subscrição mensal têm acesso às seguintes funcionalidades adicionais:"
-    sub_includes_2: "80+ níveis para praticar"
-    sub_includes_3: "Tutoriais em vídeo"
-    sub_includes_4: "Suporte por e-mail prioritário"
-    sub_includes_5: "10 novos heróis com habilidades únicas para dominar"
-    sub_includes_6: "3500 gemas de bónus todos os meses"
-    sub_includes_7: "Clãs Privados"
-    monitor_progress_title: "Como é que acompanho o progresso dos estudantes?"
-    monitor_progress_1: "O progresso dos estudantes pode ser acompanhado ao criares um"
-    monitor_progress_2: "para a tua turma."
-    monitor_progress_3: "Para adicionares um estudante, envia-lhe a ligação de convite para o teu Clã, a qual podes encontrar através da página dos"
-    monitor_progress_4: ", ao acederes ao teu."
-    monitor_progress_5: "Depois de ele se juntar, verás um resumo do progresso do estudante na tua página do Clã."
-    private_clans_1: "Os Clãs Privados garantem privacidade e informações sobre o progresso de cada estudante superiores."
-    private_clans_2: "Para criares um Clã privado, marca a caixa 'Tornar o clã privado' aquando da criação de um"
-    private_clans_3: "."
     who_for_title: "Para quem é o CodeCombat?"
-    who_for_1: "Recomendamos o CodeCombat para estudantes com idade superior a 9. Não é necessária nenhuma experiência de programação prévia."
-    who_for_2: "O CodeCombat foi pensado de forma a ser apelativo tanto para rapazes como para raparigas."
-    material_title: "Quanto material há?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-    material_1: "Aproximadamente 25 horas de conteúdo gratuito e 15 horas adicionais de conteúdo para subscritores."
-    concepts_title: "Que conceitos são abordados?"
-    how_much_title: "Quanto custa uma subscrição mensal?"
-    how_much_1: "Uma"
-    how_much_2: "subscrição mensal"
-    how_much_3: "custa $9.99 e pode ser cancelada a qualquer momento."
-    how_much_4: "Adicionalmente, oferecemos descontos para grupos maiores:"
-    how_much_5: "Aceitamos compras de uma só vez com desconto e compras de subscrições anuais para grupos, como uma turma ou escola. Por favor, contacta"
-    how_much_6: "para mais detalhes."
+    who_for_1: "Recomendamos o CodeCombat para estudantes com idade superior a 9. Não é necessária nenhuma experiência de programação prévia. O CodeCombat foi pensado de forma a ser apelativo tanto para rapazes como para raparigas."
+    who_for_2: "O nosso sistema de Cursos permite que os professores criem turmas, acompanhem o progresso e atribuam conteúdo adicional aos estudantes através de uma interface dedicada."
     more_info_title: "Onde posso encontrar mais informação?"
     more_info_1: "O nosso"
     more_info_2: "fórum para professores"
     more_info_3: "é um bom sítio para te ligares a outros professores que também usam o CodeCombat."
-    sys_requirements_title: "Requisitos do Sistema"
-    sys_requirements_1: "Um navegador moderno. As versões mais recentes do Chrome, Firefox ou Safari. Internet Explorer 9 ou mais recente."
-    sys_requirements_2: "O CodeCombat ainda não é suportado em iPad's."
 
   teachers_survey:
     title: "Inquérito para Professores"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     screenshot_included: "Captura de ecrã incluída."
     where_reply: "Para onde devemos enviar a resposta?"
     send: "Enviar Feedback"
-    contact_candidate: "Contactar Candidato" # Deprecated
-    recruitment_reminder: "Usa este formulário para chegares a candidatos que estejas interessado em entrevistar. Lembra-te que o CodeCombat cobra 15% do salário do primeiro ano. A taxa é cobrada no momento da contratação do empregado e é reembolsável durante 90 dias, no caso de o trabalhador não se manter empregado. A empregados em part-time, no estrangeiro e a contrato não são aplicadas taxas, porque são internos." # Deprecated
 
   account_settings:
     title: "Definições da Conta"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     saved: "Alterações Guardadas"
     password_mismatch: "As palavras-passe não coincidem."
     password_repeat: "Por favor repete a tua palavra-passe."
-    job_profile: "Perfil de Emprego" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "O teu perfil de emprego foi aprovado pelo CodeCombat. Os empregadores poderão ver-te até que o definas como inativo ou não o tenhas alterado à 4 semanas."
-    job_profile_explanation: "Olá! Preenche isto e entraremos em contacto contigo sobre encontrar um emprego de desenvolvedor de software para ti."
-    sample_profile: "Vê um exemplo de perfil"
-    view_profile: "Vê o Teu Perfil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Atalhos de Teclado"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     subs_only: "apenas para subscritores"
     create_clan: "Criar um Novo Clã"
     private_preview: "Pré-visualização"
+    private_clans: "Clãs Privados"
     public_clans: "Clãs Públicos"
     my_clans: "Os Meus Clãs"
     clan_name: "Nome do Clã"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     payments: "Pagamentos"
     prepaid_codes: "Códigos Pré-pagos"
     purchased: "Adquirido"
-    sale: "Promoção"
     subscription: "Subscrição"
     invoices: "Donativos"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     email_settings_url: "tuas definições de e-mail"
     email_description_suffix: "ou através de ligações presentes nos e-mails que enviamos, podes mudar as tuas preferências e parar a tua subscrição facilmente, em qualquer momento."
     cost_title: "Custo"
-    cost_description: "O CodeCombat é gratuito para os níveis fundamentais, com uma subscrição de $9.99 USD/mês para acederes a ramos de níveis extra e 3500 gemas de bónus por mês. Podes cancelar com um clique, e oferecemos uma garantia de 100% de devolução do dinheiro."
+    cost_description: "O CodeCombat é gratuito para os níveis fundamentais, com uma subscrição de ${{price}} USD/mês para acederes a ramos de níveis extra e {{gems}} gemas de bónus por mês. Podes cancelar com um clique, e oferecemos uma garantia de 100% de devolução do dinheiro."
     copyrights_title: "Direitos Autorais e Licensas"
     contributor_title: "Contrato de Licença do Contribuinte (CLA)"
     contributor_description_prefix: "Todas as contribuições, tanto no sítio como no nosso repositório GitHub, estão sujeitas ao nosso"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     nutshell_title: "Resumidamente"
     nutshell_description: "Qualquer um dos recursos que fornecemos no Editor de Níveis são de uso livre para criares Níveis. Mas reservamos o direito de distribuição restrita dos próprios Níveis (que são criados em codecombat.com) pelo que podemos cobrar por eles no futuro, se for isso que acabar por acontecer."
     canonical: "A versão Inglesa deste documento é a versão definitiva e soberana. Se houver discrepâncias entre traduções, o documento Inglês prevalece."
+    third_party_title: "Serviços de Terceiros"
+    third_party_description: "O CodeCombat usa os seguintes serviços de terceiros (entre outros):"
 
   ladder_prizes:
     title: "Prémios do Torneio" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     license: "licença"
     oreilly: "ebook à tua escolha"
 
-  account_profile:
-    settings: "Definições" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Editar Perfil"
-    done_editing: "Concluir a Edição"
-    profile_for_prefix: "Perfil para "
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "À procura de:"
-#    last_updated: "Last updated:"
-    contact: "Contactar"
-    active: "Estou à procura de ofertas de intrevistas agora"
-    inactive: "Não estou à procura de ofertas neste momento"
-#    complete: "complete"
-    next: "Seguinte"
-    next_city: "cidade?"
-    next_country: "escolhe o teu país."
-    next_name: "nome?"
-    next_short_description: "escreve uma pequena descrição."
-    next_long_description: "descreve a tua posição desejada."
-    next_skills: "lista, pelo menos, 5 habilidades."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "Blog"
-    example_personal_site: "Sítio Pessoal"
-    links_header: "Ligações Pessoais"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-    links_name: "Nome da Ligação"
-    links_name_help: "A que é que estás a ligar?"
-    links_link_blurb: "URL da Ligação"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-    basics_city: "Cidade"
-    basics_city_help: "Cidade na qual queres trabalhar (ou onde vives agora)."
-    basics_country: "País"
-    basics_country_help: "País no qual queres trabalhar (ou onde vives agora)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-    basics_looking_for: "À Procura De"
-    basics_looking_for_full_time: "Tempo Inteiro"
-    basics_looking_for_part_time: "Part-time"
-    basics_looking_for_remote: "Remoto"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-    name_anonymous: "Desenvolvedor Anónimo"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-    skills_header: "Habilidades"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-    work_years: "Anos de Experiência"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-    work_employer: "Empregador"
-    work_employer_help: "Nome do teu empregador."
-    work_role: "Título do Emprego"
-#    work_role_help: "What was your job title or role?"
-    work_duration: "Duração"
-#    work_duration_help: "When did you hold this gig?"
-    work_description: "Descrição"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Educação"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "Escola"
-    education_school_help: "Nome da tua escola."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-    education_duration_help: "Quando?"
-    education_description: "Descrição"
-    education_description_help: "Destaca algo sobre esta experiência educacional. (140 carateres; opcional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-    projects: "Projetos"
-    projects_header: "Adiciona 3 projetos"
-    projects_header_2: "Projetos (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-    project_name: "Nome do Projeto"
-    project_name_help: "Qual era o nome do projeto?"
-    project_description: "Descrição"
-    project_description_help: "Descreve o projeto em poucas palavras."
-    project_picture: "Imagem"
-    project_picture_help: "Faz upload de uma imagem 230x115px ou maior que mostre o projeto."
-    project_link: "Ligação"
-    project_link_help: "Ligação para o projeto."
-    player_code: "Código do Jogador"
-
-  employers:
-    deprecation_warning_title: "Desculpa, o CodeCombat não está a recrutar por agora."
-    deprecation_warning: "Atualmente, estamos a focar-nos em níveis para iniciantes, em vez de tentar encontar desenvolvedores peritos."
-    hire_developers_not_credentials: "Não contrates cartas de recomendação, mas sim programadores." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Começar"
-    already_screened: "Nós já selecionamos tecnicamente todos os nossos candidatos"
-    filter_further: ", mas ainda podes filtrar mais:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Autorizado Para Trabalhar Nos EUA"
-    filter_visa_no: "Não Autorizado"
-    filter_education_top: "Universidade"
-    filter_education_other: "Outro"
-    filter_role_web_developer: "Desenvolvedor da Web"
-    filter_role_software_developer: "Desenvolvedor de Software"
-    filter_role_mobile_developer: "Desenvolvedor Mobile"
-    filter_experience: "Experiência"
-    filter_experience_senior: "Sénior"
-    filter_experience_junior: "Júnior"
-    filter_experience_recent_grad: "Graduado Recentemente"
-    filter_experience_student: "Estudante Universitário"
-    filter_results: "resultados"
-    start_hiring: "Começar a contratar."
-    reasons: "Três razões pelas quais deves contratar através de nós:"
-    everyone_looking: "Aqui todos estão à procura da próxima oportunidade deles."
-    everyone_looking_blurb: "Esquece os cerca de 20% de taxas de resposta do LinkedIn InMail. Todos os que nós listamos neste sítio querem encontrar a nova posição deles e responderão ao teu pedido para uma introdução."
-    weeding: "Relaxa; fizemos a parte mais difícil por ti."
-    weeding_blurb: "Cada jogador que listamos foi sujeito a um teste das habilidades técnicas. Também fazemos testes por telefone para selecionar candidatos e fazer anotações nos perfis deles para te poupar tempo."
-    pass_screen: "Eles passarão o teu teste técnico."
-    pass_screen_blurb: "Revê o código de cada candidato antes de chegares a ele. Um funcionário descobriu que 5x mais programadores nossos passaram o teste técnico deles do que os contratados através do Hacker News."
-    make_hiring_easier: "Torne a minha contratação mais fácil, por favor."
-    what: "O que é o CodeCombat?"
-    what_blurb: "O CodeCombat é um jogo de programação, no navegador e multijogador. Os jogadores escrevem código para controlar as forças deles em batalha contra outros programadores. Os nossos jogadores têm experiência com todos os conceitos tecnológicos principais."
-    cost: "Quanto é que cobramos?"
-    cost_blurb: "Cobramos 15% do salário do primeiro ano e ofereçemos uma garantia de devolução de 100% do dinheiro durante 90 dias. Não cobramos por candidatos que já estejam a ser ativamente entrevistados na tua companhia."
-    candidate_name: "Nome"
-    candidate_location: "Localização"
-    candidate_looking_for: "À Procura de"
-    candidate_role: "Cargo"
-    candidate_top_skills: "Principais Habilidades"
-    candidate_years_experience: "Anos de Experiência"
-    candidate_last_updated: "Última Vez Atualizado"
-    candidate_who: "Quem"
-    featured_developers: "Programadores em Destaque"
-    other_developers: "Outros Programadores"
-    inactive_developers: "Programadores Inativos"
-
   admin:
     av_espionage: "Espionagem" # Really not important to translate /admin controls.
     av_espionage_placeholder: "E-mail ou nome de utilizador"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Utilizadores"
     av_entities_active_instances_url: "Activar Instâncias"
-    av_entities_employer_list_url: "Lista de Empregadores"
-    av_entities_candidates_list_url: "Lista de Candidatos"
     av_entities_user_code_problems_list_url: "Lista de Problemas no Código do Jogador"
     av_other_sub_title: "Outro"
     av_other_debug_base_url: "Base (para depurar base.jade)"
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 928df1ed0..bd09656e0 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     multiplayer: "Multiplayer" # Not currently shown on home page
     for_developers: "Pentru Dezvoltatori" # Not currently shown on home page.
     or_ipad: "Sau descarcă pentru iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Nivele" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     creating: "Se creează contul..."
     sign_up: "Înscrie-te"
     log_in: "loghează-te cu parola"
-    social_signup: "Sau, te poți inregistra cu Facebook sau G+:"
     required: "Trebuie să te înregistrezi înaite să parcurgi acest drum."
     login_switch: "Ai deja un cont?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     incomplete: "Incomplet"
     timed_out: "Ai rămas fără timp"
     failing: "Eşec"
-    action_timeline: "Timeline-ul acțiunii"
-    click_to_select: "Apasă pe o unitate pentru a o selecta."
     control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Alătură-Te Jocului"
     reload: "Reîncarca"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     parents_title: "Dragă Părinte: Copilul tău învață programare. Vrei să îl ajuți să continue?"
     parents_blurb1: "Copilul tău a jucat __nLevels__ nivele și a învățat bazele programări. Ajutăl și cultivă interesul cumpărând un abonament ca să joace în continuare."
     parents_blurb1a: "Programarea unui computer este o abilitate esențială pe care copilul dumneavoastră o va folosi fără îndoială ca adult. Până in 2020, va fi nevoie de abilități de software de bază de 77% din locurile de muncă, și ingineri software sunt în cerere mare în întreaga lume. Știați că Informatica este gradul universitar cel mai bine plătit?"
-    parents_blurb2: "Pentru $9.99 USD/lună, copilul tău va primi provocări noi în fiecare săptămână și ajutor personal pe e-mail de la programatori profesioniști."
+    parents_blurb2: "Pentru ${{price}} USD/lună, copilul tău va primi provocări noi în fiecare săptămână și ajutor personal pe e-mail de la programatori profesioniști."
     parents_blurb3: "Fără Riscuri: Garanție 100% bani înapoi, o dezabonare ușoară cu 1-click."
     payment_methods: "Metode de plată"
     payment_methods_title: "Metode de plată acceptate"
     payment_methods_blurb1: "Deocamdată acceptăm numai cărti de credit si Alipay." # {change}
     payment_methods_blurb2: "Dacă aveți nevoie de o formă alternativă de plată, vă rugăm să ne contactați"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
     stripe_description: "Abonament Lunar"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
     subscription_required_to_play: "Ai nevoie de abonament ca să joci acest nivel."
     unlock_help_videos: "Abonează-te pentru deblocarea tuturor tutorialelor video."
     personal_sub: "Abonament Personal" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     currently_free_until: "Ai un abonament gratuit până pe"
     was_free_until: "Ai avut un abonament gratuit până pe"
     managed_subs: "Abonamente Gestionate"
-    managed_subs_desc: "Adaugă abonamente pentru alți jucători (studenți, copii, etc.)"
-    managed_subs_desc_2: "Recipienți trebuie să aibă un cont CodeCombat associat cu adresa e-mail oferită."
-    group_discounts: "Discount pentru Grupuri"
-    group_discounts_1: "De asemenea, oferim reduceri de grup pentru abonamente în vrac."
-    group_discounts_1st: "Primul Abonament"
-    group_discounts_full: "Preț Intreg"
-    group_discounts_2nd: "2-11 abonamente"
-    group_discounts_20: "20% reducere"
-    group_discounts_12th: "12+ abonamente"
-    group_discounts_40: "40% reducere"
     subscribing: "Te abonăm..."
-    recipient_emails_placeholder: "Introduceți adresa de email ca să vă abonăm, una pe fiecare linie."
-    subscribe_users: "Abonați Userii"
-    users_subscribed: "Useri abonați:"
-    no_users_subscribed: "Nici-un user abonat, verificațî adresele e-mail."
     current_recipients: "Recipienți curenți"
     unsubscribing: "Te Dezabonăm..." # {change}
     subscribe_prepaid: "Dăi Click pe Abonare pentru a folosi un cod prepaid"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Info pentru Educatori"
-    intro_1: "CodeCombat este un joc online care te învață programare. Studenți scriu cod în limbaje de programare reale."
-    intro_2: "Nu este nevoie de experiența în domeniu!"
-    free_title: "Cât de mult costă?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "Sunt 80+ de nivele GRATIS ce parcurg fiecare concept în programare." # {change}
-    free_2: "Un abonament lunar oferă acces la tutoriale video si nivele extra pentru practică."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Educatori primesc abonamente gratuite!" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Te rugăm sa completezi"
-    teacher_subs_2: "Chestionarul Educatorului"
-    teacher_subs_3: "pentru a configura abonamentul." # {change}
-    sub_includes_title: "Ce e inclus în abonament?"
-    sub_includes_1: "Pe langă 80+ de nivele de bază, studenții cu un abonament lunar au acces la aceste servicii suplimentare:" # {change}
-    sub_includes_2: "60+ nivele pentru practică" # {change}
-    sub_includes_3: "Tutoriale Video"
-    sub_includes_4: "Suport pe e-mail premium"
-    sub_includes_5: "7 eroi noi cu abilități unice de stăpânit" # {change}
-    sub_includes_6: "3500 de Pietre Prețioase bonus in fiecare lună"
-    sub_includes_7: "Clanuri Private"
-    monitor_progress_title: "Cum monitorizez progresul unui student?"
-    monitor_progress_1: "Progresul poate fi urmărit creând"
-    monitor_progress_2: "pentru clasa ta."
-    monitor_progress_3: "Pentru a adăuga un student, trimite o invitație în Clanul tău, care este pe"
-    monitor_progress_4: "pagină."
-    monitor_progress_5: "După ce se alătură, vei vedea un rezumat cu progresul studentului pe pagina Clanului tău."
-    private_clans_1: "Clanurile Private oferă intimitate si informați despre progres detaliate pentru fiecare student."
-    private_clans_2: "Pentru a crea un Clan privat, verifică caseta \"Fă Clanul Privat\" când creezi un"
-    private_clans_3: "."
     who_for_title: "Pentru cine este CodeCombat?"
-    who_for_1: "Recomandăm CodeCombat pentru studenți cu vârsta de la 9 ani în sus. Nu este nevoie de experiență de programare."
-    who_for_2: "Am proiectat CodeCombat pentru a atrage atât băieți cat si fete."
-    material_title: "Cât de mult material conține?"
-    material_premium_server: "Aproximativ 30 de ore de gameplay răspândite peste 140+ de nivele pentru abonați, si nivele noi în fiecare săptămână." # {change}
-    material_1: "Aproximativ 10 ore de material gratis si adițional 20 de ore în plus pentru abonați, cu nivele noi în fiecare săptămână." # {change}
-    concepts_title: "Ce concepte sunt parcurse?"
-    how_much_title: "Cât de mult costă un abonament lunar?"
-    how_much_1: "Un"
-    how_much_2: "Abonament Lunar"
-    how_much_3: "costă $9.99, și poate fi anulat oricând."
-    how_much_4: "Adițional, oferim discount-uri pentru grupui mari:"
-    how_much_5: "Acceptăm achiziții unice, si abonamente anuale pentru grupuri, cum ar fi o clasă de elevi, toate cu discount. Contactați-ne"
-    how_much_6: "pentru mai multe detalii."
+    who_for_1: "Recomandăm CodeCombat pentru studenți cu vârsta de la 9 ani în sus. Nu este nevoie de experiență de programare." # {change}
+    who_for_2: "Am proiectat CodeCombat pentru a atrage atât băieți cat si fete." # {change}
     more_info_title: "Unde găsesc mai multe informații?"
     more_info_1: ""
     more_info_2: "Forumul de educatori"
     more_info_3: "este un loc bun pentru a vă conecta cu colegii educatori ce folosesc CodeCombat."
-    sys_requirements_title: "Cerințe de Sistem"
-    sys_requirements_1: "Un browser modern. Versiuni mai noi de Chrome, Firefox, sau Safari. Internet Explorer 9 sau o versiune mai nouă."
-    sys_requirements_2: "CodeCombat nu funcționează pe iPad încă"
 
   teachers_survey:
     title: "Chestionar Educatori"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     screenshot_included: "Screenshot-uri incluse."
     where_reply: "Unde ar trebui să răspundem?"
     send: "Trimite Feedback"
-    contact_candidate: "Contacteaza Candidatul" # Deprecated
-    recruitment_reminder: "Folosiți acest formular pentru a ajunge la candidații care va intereseaza pentru interviu. CodeCombat percepe 15% din salariu în primul an. Taxa este datorată la angajare și este rambursabilă pentru 90 de zile în cazul în care salariatul nu rămâne angajat. Cele part time, și angajați cu contract la distanță sunt gratuite, așa cum sunt stagiari." # Deprecated
 
   account_settings:
     title: "Setări Cont"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     saved: "Modificări salvate"
     password_mismatch: "Parola nu se potrivește."
     password_repeat: "Te rugăm sa repeți parola."
-    job_profile: "Profil Job" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Profilul de job a fost aprobat de CodeCombat Angajatorii pot să il vadă pană îl marchezi ca inactiv sau dacă nu e schimbat timp de 4 săptămâni."
-    job_profile_explanation: "Salut! Completează formularul, și te vom contacta ca să iți gasești un job ca software developer."
-    sample_profile: "Vezi un profil exemplu"
-    view_profile: "Vizualizează Profilul"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Scurtături Keyboard"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     subs_only: "numai abonați"
     create_clan: "Creează un clan Nou"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
     public_clans: "Clanuri Publice"
     my_clans: "Clanurile mele"
     clan_name: "Numele Clanului"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     payments: "Plăți"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Cumpărate"
-#    sale: "Sale"
     subscription: "Abonament"
     invoices: "Invoice-uri"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     email_settings_url: "setările tale de email"
     email_description_suffix: " sau prin link-urile din email-urile care vi le trimitem, puteți să schimbați preferințele și să vâ dezabonați oricând."
     cost_title: "Cost"
-    cost_description: "Momentan, CodeCombat este 100% gratis! Unul dintre obiectele noastre principale este să îl menținem așa, astfel încât să poată juca cât mai mulți oameni. Dacă va fi nevoie , s-ar putea să percepem o plată pentru anumite servici, dar am prefera să nu o facem. Cu puțin noroc, vom putea susține compania cu:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Drepturi de autor și licențe"
     contributor_title: "Acord de licență Contributor"
     contributor_description_prefix: "Toți contribuitorii, atât pe site cât și pe GitHub-ul nostru, sunt supuși la"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     nutshell_title: "Pe scurt"
     nutshell_description: "Orice resurse vă punem la dispoziție în Editorul de Nivele puteți folosi liber cum vreți pentru a crea nivele. Dar ne rezervăm dreptul de a rezerva distribuția de nivele în sine (care sunt create pe codecombat.com) astfel încât să se poată percepe o taxă pentru ele pe vitor, dacă se va ajunge la așa ceva."
     canonical: "Versiunea in engleză a acestui document este cea definitivă, versiunea canonică. Dacă există orice discrepanțe între traduceri, documentul in engleză are prioritate."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Premii Turnee" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     license: "licență"
     oreilly: "ebook la alegere"
 
-  account_profile:
-    settings: "Setări" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Modifică Profil"
-    done_editing: "Am terminat modificările."
-    profile_for_prefix: "Profil pentru "
-    profile_for_suffix: ""
-    featured: "Recomandate"
-    not_featured: "Nerecomandate"
-    looking_for: "Caută:"
-    last_updated: "Listă updatată:"
-    contact: "Contact"
-    active: "Caut oferte de interviu."
-    inactive: "Nu caut oferte"
-    complete: "complet"
-    next: "Următorul"
-    next_city: "oraș?"
-    next_country: "alege țara."
-    next_name: "nume?"
-    next_short_description: "scrie o scurtă descriere."
-    next_long_description: "descrie poziția dorită."
-    next_skills: "listează cel puțin cinci competențe."
-    next_work: "cronica istoricului dvs. de lucru."
-    next_education: "povesteste-ne de chinurile educaționale"
-    next_projects: "scoate in evidență pana la 3 proiecte la care ai lucrat."
-    next_links: "adăugă orice link-uri personale sau sociale."
-    next_photo: "adăugă o fotografie profesionala opțională."
-    next_active: "indică că esti deschis la oferte ca să apară în căutări."
-    example_blog: "Blog"
-    example_personal_site: "Site Personal"
-    links_header: "Link-uri Personale"
-    links_blurb: "Link către orice alte site-uri sau profiluri pe care doriți să se sublinieze, ca GitHub, LinkedIn, sau blog-ul personal."
-    links_name: "Nume Link"
-    links_name_help: "Către ce faci link?"
-    links_link_blurb: "Link URL"
-    basics_header: "Actualizați informații de bază"
-    basics_active: "Deschis la Oferte"
-    basics_active_help: "Vrei oferte de interviu chiar acum?"
-    basics_job_title: "Titlul jobului dorit"
-    basics_job_title_help: "What role are you looking for?"
-    basics_city: "Oraș"
-    basics_city_help: "Orașul în care vrei să muncești (sau unde locuiești acum)."
-    basics_country: "Țara"
-    basics_country_help: "Țara în care vrei să muncești (sau locuiești acum)."
-    basics_visa: "Stare Muncă in US"
-    basics_visa_help: "Ești autorizat să muncești în US sau ai nevoie de sponsorizare de viză? (Dacă locuești în Canada sau Australia, bifează autorizat.)"
-    basics_looking_for: "Caut"
-    basics_looking_for_full_time: "Full-time"
-    basics_looking_for_part_time: "Part-time"
-    basics_looking_for_remote: "La distanță"
-    basics_looking_for_contracting: "Contractant"
-    basics_looking_for_internship: "Internship"
-    basics_looking_for_help: "Ce fel de poziție ca Dezvoltator vrei?"
-    name_header: "Scrieți numele"
-    name_anonymous: "Dezvoltator Anonim"
-    name_help: "Numele pe care vrei ca angajatori să îl vadă, ex: 'Nick Winter'."
-    short_description_header: "Scrie o descriere scurtă despre tine"
-    short_description_blurb: "Adaugă un slogan ca un angajator să te cunoască mai repede."
-    short_description: "Slogan"
-    short_description_help: "Cine ești, și ce te interesează? 140 charactere max."
-    skills_header: "Aptitudini"
-    skills_help: "Alege aptitudini de dezvoltator relevante în ordinea experienței."
-    long_description_header: "Descrie poziția preferată"
-    long_description_blurb: "Spune-le angajatorilor cat de minunat ești si ce rol vrei."
-    long_description: "Descrierea Ta"
-    long_description_help: "Descrie-te la potențiali angajatori. Să fie scurt si la obiect. Recomandăm să subliniezi poziția care te interesează. Un Markdown savuros este ok; 600 charactere max."
-    work_experience: "Experiența Muncă"
-    work_header: "Istoricul locurilor undei ai muncit"
-    work_years: "Ani de experiență"
-    work_years_help: "Câți ani de experiență profesională (în care ai fost plătit) ca dezvoltator software ai?"
-    work_blurb: "Listează experiența de lucru relevantă, cea mai recentă prima."
-    work_employer: "Angajator"
-    work_employer_help: "Numele angajatorului."
-    work_role: "Titlul Jobului"
-    work_role_help: "Care a fost titlul jobului tău sau rolul?"
-    work_duration: "Durata"
-    work_duration_help: "Cand ai avut acest job?"
-    work_description: "Descriere"
-    work_description_help: "Ce ai făcut acolo? (14 char: opțional) "
-    education: "Educație"
-    education_header: "Povestește-ne chinurile academice"
-    education_blurb: "Listează informații despre educația ta."
-    education_school: "Școală"
-    education_school_help: "Numele Școlii"
-    education_degree: "Grad"
-    education_degree_help: "Care a fost gradul si domeniul de studiu?"
-    education_duration: "Date"
-    education_duration_help: "Când?"
-    education_description: "Descriere"
-    education_description_help: "Evidențiază orice despre experiența ta educațională. (140 char; opțional)"
-    our_notes: "Note CodeCombat"
-    remarks: "Observații"
-    projects: "Proiecte"
-    projects_header: "Adaugă 3 proiecte"
-    projects_header_2: "Proiecte (Top 3)"
-    projects_blurb: "Evidențiază-ți proiectele să impresionezi angajatorii."
-    project_name: "Numele Proiectului"
-    project_name_help: "Cum s-a numit proiectul?"
-    project_description: "Descriere"
-    project_description_help: "Descrie pe scurt proiectul."
-    project_picture: "Poză"
-    project_picture_help: "Uploadează o poză de 230x115px sau mai mare cu proiectul."
-    project_link: "Link"
-    project_link_help: "Link la proiect."
-    player_code: "Codul Jucătorului"
-
-  employers:
-    deprecation_warning_title: "Ne pare rău, CodeCombat nu recrutează acum."
-    deprecation_warning: "Ne axăm pe nivelele pentru începători în loc să găsim dezvoltatori experți deocamdată."
-    hire_developers_not_credentials: "Angajează dezvoltatori, nu scrisori de acreditare." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Începe"
-    already_screened: "Deja am verificat tehnic toți candidați noștri"
-    filter_further: ", dar poți să filtrezi mai departe:"
-    filter_visa: "Viză"
-    filter_visa_yes: "US Autorizat"
-    filter_visa_no: "Neauthorized"
-    filter_education_top: "Top Școală"
-    filter_education_other: "Altele"
-    filter_role_web_developer: "Web Developer"
-    filter_role_software_developer: "Software Developer"
-    filter_role_mobile_developer: "Mobile Developer"
-    filter_experience: "Experiență"
-    filter_experience_senior: "Senior"
-    filter_experience_junior: "Junior"
-    filter_experience_recent_grad: "Grad Recent"
-    filter_experience_student: "Student Facultate"
-    filter_results: "rezultate"
-    start_hiring: "Începe angajările."
-    reasons: "Trei motive pentru care să angajezi prin intermediul nostru:"
-    everyone_looking: "Toți de aici caută următoarea oportunitate."
-    everyone_looking_blurb: "Uită de 20% răspunsuri pe LinkedIn InMail. Toți cei pe care îi listăm pe acest site vor să își găsească următoarea poziție și vor răspunde la cerere cu o introducere. "
-    weeding: "Relaxsează-te; noi ne ocupăm de selecții."
-    weeding_blurb: "Fiecare jucător pe care îl listăm aici i-au fost testate abilitățile tehnice. De asemenea îi selecționăm telefonic și facem notițe despre profilul fiecăruia ca să iți economisim timpul."
-    pass_screen: "O să treacă examenul dvs. tehnic."
-    pass_screen_blurb: "Examinați codul fiecărui candidat înainte să îi contactați. Un angajator a constatat că de 5 ori mai mulți dezvoltatori au trecut examenul tehnic decât cei angajați de pe Hacker News."
-    make_hiring_easier: "Fă angajarea mai ușoară, te rugăm."
-    what: "Ce este CodeCombat?"
-    what_blurb: "CodeCombat este un joc multiplayer în browser ce te învața programare. Jucătorii scriu cod ca să iși controleze forțele împotriva celorlalți Dezvoltatori."
-    cost: "Căt de mult taxăm?"
-    cost_blurb: "Percepem 15% din salariul pe primul an si oferim o garanție 100% bani inapoi pentru 90 de zile. Nu taxăm candidați care sunt în cursul unui interviu la o companie."
-    candidate_name: "Nume"
-    candidate_location: "Locație"
-    candidate_looking_for: "Caută"
-    candidate_role: "Rol"
-    candidate_top_skills: "Top Skills"
-    candidate_years_experience: "Exp Ani"
-    candidate_last_updated: "Ultimul Update"
-    candidate_who: "Cine"
-    featured_developers: "Dezvoltatori Featured"
-    other_developers: "Alți Dezvoltatori"
-    inactive_developers: "Dezvoltatori Inactivi"
-
   admin:
     av_espionage: "Spionaj" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Email sau username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     av_entities_sub_title: "Entități"
     av_entities_users_url: "Utilizatori"
     av_entities_active_instances_url: "Instanțe active"
-    av_entities_employer_list_url: "Lista Angajatoriilor"
-    av_entities_candidates_list_url: "Lista Candidațiilor"
     av_entities_user_code_problems_list_url: "Listă probleme de cod de utilizator"
     av_other_sub_title: "Altele"
     av_other_debug_base_url: "Base (pentru debugging base.jade)"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 6550c4090..0926a5bdd 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     multiplayer: "Мультиплеер" # Not currently shown on home page
     for_developers: "Разработчикам" # Not currently shown on home page.
     or_ipad: "Или скачайте на iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Уровни" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     creating: "Создание аккаунта..."
     sign_up: "Регистрация"
     log_in: "вход с паролем"
-    social_signup: "Или вы можете зарегистрироваться через Facebook или G+:"
     required: "Войдите для того, чтобы продолжить."
     login_switch: "Уже есть аккаунт?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     incomplete: "Не завершено"
     timed_out: "Время истекло"
     failing: "Неудача"
-    action_timeline: "График действий"
-    click_to_select: "Выберите персонажа, щёлкнув на нём"
     control_bar_multiplayer: "Мультиплеер"
     control_bar_join_game: "Присоединиться"
     reload: "Перезагрузить"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     parents_title: "Дорогой Родитель, ваш ребенок учится программировать. Вы поможете ему?"
     parents_blurb1: "Ваш ребенок прошел уже __nLevels__ уровней и выучил основы программирования. Помогите развить их интерес и купите им подписку, чтобы они могли продолжить играть."
     parents_blurb1a: "Программирование - это существенный навык, который ваш ребенок несомненно будет использовать, когда станет взрослым. В 2020, базовые навыки работы с программным обеспечением будут необходимы для 77% профессий, а программные инженеры пользуются высоким спросом по всему миру. Вы знали, что компьютерная наука - это наиболее оплачиваемая специальность?"
-    parents_blurb2: "За $9.99 USD/месяц ваш ребенок получит новые испытания каждую неделю и персональную поддержку профессиональных программистов через электронную почту."
+    parents_blurb2: "За ${{price}} USD/месяц ваш ребенок получит новые испытания каждую неделю и персональную поддержку профессиональных программистов через электронную почту."
     parents_blurb3: "Без риска: 100% гарантия возврата денег, возможность отписаться в 1 клик."
     payment_methods: "Методы оплаты"
     payment_methods_title: "Принимаемые методы оплаты"
     payment_methods_blurb1: "На данный момент мы принимаем кредитные карты и Alipay." # {change}
     payment_methods_blurb2: "Если вам необходим альтернативный способ оплаты, пожалуйста, свяжитесь"
-    sale_already_subscribed: "У вас уже есть подписка!"
-    sale_blurb1: "Скидка $21" # {change}
-    sale_blurb2: "от годовой подписки за $120 на весь год!"
     sale_button: "Распродажа!"
-    sale_button_title: "Сэкономьте $21 при приобретении годовой подписки" # {change}
-    sale_click_here: "Нажмите сюда"
-    sale_ends: "Заканчивается"
-    sale_extended: "*Текущие подписки будут продлены на год."
-    sale_feature_here: "Вот что вы получите:"
-    sale_feature2: "Доступ к 9 сильным<strong>новым героям</strong>с уникальными умениями!"
-    sale_feature4: "<strong>42,000 бонусных самоцветов</strong> в подарок!"
-    sale_continue: "Готовы продолжить путешествие?"
-    sale_limited_time: "Ограниченное предложение!"
-    sale_new_heroes: "Новые герои!"
-    sale_title: "Назад на школьную распродажу"
-    sale_view_button: "Купи годовую подписку за"
+    sale_button_title: "Сэкономьте ${{discount}} при приобретении годовой подписки" # {change}
     stripe_description: "Месячная подписка"
-    stripe_description_year_sale: "Годовая подписка ($21 скидка)" # {change}
+    stripe_description_year_sale: "Годовая подписка (${{discount}} скидка)" # {change}
     subscription_required_to_play: "Чтобы сыграть этот уровень нужна подписка."
     unlock_help_videos: "Подпишитесь, чтобы разблокировать все обучающие видео."
     personal_sub: "Личная подписка" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     currently_free_until: "Сейчас вы имеете бесплатную подписку до"
     was_free_until: "Вы имели бесплатную подписку до"
     managed_subs: "Управляемые подписки"
-    managed_subs_desc: "Добавьте подписки для других игроков (студенты, дети и т.д.)"
-    managed_subs_desc_2: "Получатели должны иметь аккаунт CodeCombat, связанный с email-адресом, указанным вами."
-    group_discounts: "Групповые скидки"
-    group_discounts_1: "Так же мы предлагаем групповые скидки для нескольких подписок."
-    group_discounts_1st: "1-я подписка"
-    group_discounts_full: "Полная стоимость"
-    group_discounts_2nd: "Подписки со 2-й по 11-ю"
-    group_discounts_20: "20% скидка"
-    group_discounts_12th: "Подписки 12-я и больше"
-    group_discounts_40: "40% скидка"
     subscribing: "Подписываемся..."
-    recipient_emails_placeholder: "Введите email-адреса для подписки, по одному на каждой линии."
-    subscribe_users: "Подписать пользователей"
-    users_subscribed: "Подписанные пользователи:"
-    no_users_subscribed: "Нет подписанных пользователей. Пожалуйста, проверьте список email-адресов еще раз."
     current_recipients: "Текущие получатели"
     unsubscribing: "Отписываемся..." # {change}
     subscribe_prepaid: "Нажмите 'Подпишись', чтобы использовать предоплаченный код"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Информация для учителей"
-    intro_1: "CodeCombat - это онлайн игра, которая обучает программированию. Ученики пишут код на реальных языках программирования."
-    intro_2: "Опыт не обязателен!"
-    free_title: "Сколько это стоит?"
-    cost_premium_server: "CodeCombat бесплатный в течение первых пяти уровней, после чего он стоит $ 9,99 USD в месяц за доступ к другим нашим 190+ уровням на наших эксклюзивных серверах."
-    free_1: "В наличии более 80 БЕСПЛАТНЫХ уровней, которые покрывают каждый концепт." # {change}
-    free_2: "Месячная подписка предоставляет доступ к видео-урокам и дополнительным уровням."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Учителя получают бесплатные подписки!" # {change}
-    teacher_subs_0: "Мы предлагаем бесплатную подписку для тестирования студентов." # {change}
-    teacher_subs_1: "Пожалуйста, заполните нашу"
-    teacher_subs_2: "Анкету учителя"
-    teacher_subs_3: "для настройки вашей подписки." # {change}
-    sub_includes_title: "Что включено в подписку?"
-    sub_includes_1: "В дополнение к более чем 80 бесплатным уровням ученики с месячной подпиской получат доступ к дополнительным возможностям:" # {change}
-    sub_includes_2: "Более 60 уровней для дополнительной практики" # {change}
-    sub_includes_3: "Видео-уроки"
-    sub_includes_4: "Эксклюзивная поддержка по электронной почте"
-    sub_includes_5: "7 новых героев с уникальными возможностями для оттачивания мастерства" # {change}
-    sub_includes_6: "3500 бонусных самоцветов каждый месяц"
-    sub_includes_7: "Частные Кланы"
-    monitor_progress_title: "Как мне следить за прогрессом студентов?"
-    monitor_progress_1: "Прогресс студентов может быть отследить, создав"
-    monitor_progress_2: "для вашего класса."
-    monitor_progress_3: "Чтобы добавить студентов, отправьте им ссылку-пришлашение в ваш Клан, которую можно найти на"
-    monitor_progress_4: "странице."
-    monitor_progress_5: "После того, как они присоединятся, вы увидите сводку по прогрессам студентов на странице вашего Клана."
-    private_clans_1: "Частные Кланы обеспечивают повышенную конфиденциальность и детальную информацию по прогрессу каждого студента."
-    private_clans_2: "Чтобы создать частный Клан, отметьте флажок 'Сделать клан частным', когда будете создавать"
-    private_clans_3: "."
     who_for_title: "Для кого предназначен CodeCombat?"
-    who_for_1: "Мы рекомендуем CodeCombat для учеников старше 9 лет. Какой-либо опыт программирования не требуется."
-    who_for_2: "Мы разработали CodeCombat так, чтобы он подходил и мальчикам и девочкам."
-    material_title: "Как много здесь материала?"
-    material_premium_server: "Около 30 часов игрового процесса, распределенного более чем на 140 уровней для подписчиков с добавлением новых уровней каждую неделю." # {change}
-    material_1: "Около 10 часов бесплатного контента и 20 часов дополнительного контента для подписчиков с добавлением новых уровней каждую неделю." # {change}
-    concepts_title: "О каких концептах мы рассказываем?"
-    how_much_title: "Сколько стоит месячная подписка?"
-    how_much_1: "Цена"
-    how_much_2: "месячной подписки"
-    how_much_3: "- $9.99. Подписка может быть отменена в любой момент."
-    how_much_4: "Дополнительно мы предоставляем скидки для больших групп:"
-    how_much_5: "Мы предлагаем скидки для разовых покупок и годовых подписок для групп, таких как класс или школа. Пожалуйста, напишите на"
-    how_much_6: "для получения подробностей."
+    who_for_1: "Мы рекомендуем CodeCombat для учеников старше 9 лет. Какой-либо опыт программирования не требуется." # {change}
+    who_for_2: "Мы разработали CodeCombat так, чтобы он подходил и мальчикам и девочкам." # {change}
     more_info_title: "Где я могу найти больше информации?"
     more_info_1: "Наш"
     more_info_2: "форум учителей"
     more_info_3: "хорошее место для связи с другими педагогами, уже использующими CodeCombat."
-    sys_requirements_title: "Системные требования"
-    sys_requirements_1: "Современный веб-браузер. Последние версии Chrome, Firefox или Safari. Internet Explorer 9 или новее."
-    sys_requirements_2: "CodeCombat пока не доступен на iPad."
 
   teachers_survey:
     title: "Анкета учителя"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     screenshot_included: "Скриншот прилагается."
     where_reply: "Куда мы должны ответить?"
     send: "Отправить отзыв"
-    contact_candidate: "Связаться с кандидатом" # Deprecated
-    recruitment_reminder: "Используйте эту форму, чтобы обратиться к кандидатам, если вы заинтересованы в интервью. Помните, что CodeCombat взимает 18% от первого года зарплаты. Плата производится по найму сотрудника и подлежит возмещению в течение 90 дней, если работник не остаётся на рабочем месте. Работники с частичной занятостью, работающие удалённо и по контракту свободны, как стажёры." # Deprecated
 
   account_settings:
     title: "Настройки аккаунта"
@@ -737,17 +656,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     wrong_password: "Неверный пароль"
     upload_picture: "Загрузить изображение"
     delete_this_account: "Удалить этот аккаунт навсегда"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
+    reset_progress_tab: "Сбросить весь прогресс"
+    reset_your_progress: "Сбросить весь прогресс и начать заново"
     god_mode: "Режим бога"
     password_tab: "Пароль"
     emails_tab: "Email-адреса"
     admin: "Админ"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "Нажмите здесь для управления вашей подпиской."
     new_password: "Новый пароль"
     new_password_verify: "Подтверждение пароля"
     type_in_email: "Введите ваш email для подтверждения удаления аккаунта"
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
+    type_in_email_progress: "Наберите свой email для подтверждения удаления вашего прогресса."
     type_in_password: "Так же введите ваш пароль" # {change}
     email_subscriptions: "Email-подписки"
     email_subscriptions_none: "Нет активных подписок."
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     saved: "Изменения сохранены"
     password_mismatch: "Пароли не совпадают."
     password_repeat: "Пожалуйста, повторите пароль."
-    job_profile: "Профиль соискателя" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Ваш профиль соискателя был одобрен CodeCombat. Работодатели смогут видеть его, пока вы не отметите его неактивным или он не будет изменен в течение четырёх недель."
-    job_profile_explanation: "Привет! Заполните это, и мы свяжемся с вами при нахождении работы разработчика программного обеспечения для вас."
-    sample_profile: "Посмотреть пример профиля"
-    view_profile: "Просмотр вашего профиля"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Горячие клавиши"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     subs_only: "только для подписчиков"
     create_clan: "Создать новый клан"
     private_preview: "Превью"
+#    private_clans: "Private Clans"
     public_clans: "Публичные кланы"
     my_clans: "Мои кланы"
     clan_name: "Имя клана"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     payments: "Платежи"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Куплено"
-    sale: "Распродажа"
     subscription: "Подписка"
     invoices: "Счета"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     email_settings_url: "ваши email настройки"
     email_description_suffix: "или через ссылки в email-ах, которые мы отправляем, вы можете изменить предпочтения и легко отписаться в любой момент."
     cost_title: "Стоимость"
-    cost_description: "CodeCombat бесплатен для игры на базовых уровнях, с подпиской за $9.99 USD/месяц вы получите доступ к дополнительным ветвям уровней и 3500 бонусным самоцветам в месяц. Вы можете отказаться в 1 клик, и мы предлагаем 100% гарантию возврата денег."
+    cost_description: "CodeCombat бесплатен для игры на базовых уровнях, с подпиской за ${{price}} USD/месяц вы получите доступ к дополнительным ветвям уровней и {{gems}} бонусным самоцветам в месяц. Вы можете отказаться в 1 клик, и мы предлагаем 100% гарантию возврата денег."
     copyrights_title: "Авторские права и лицензии"
     contributor_title: "Лицензионное соглашение соавторов"
     contributor_description_prefix: "Все вклады, как на сайте, так и на нашем репозитории GitHub, подпадают под наше"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     nutshell_title: "В двух словах"
     nutshell_description: "Любые ресурсы, которые мы предоставляем в Редакторе уровней можно свободно использовать как вам нравится для создания уровней. Но мы оставляем за собой право ограничивать распространение уровней самих по себе (которые создаются на codecombat.com), чтобы за них могла взиматься плата в будущем, если до этого дойдёт."
     canonical: "Английская версия этого документа является определяющей и канонической. Если есть какие-либо расхождения между переводами, документ на английском имеет приоритет."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Турнирные призы" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     license: "лицензия"
     oreilly: "электронная книга на ваш выбор"
 
-  account_profile:
-    settings: "Настройки" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Редактировать профиль"
-    done_editing: "Завершить редактирование"
-    profile_for_prefix: "Профиль для "
-    profile_for_suffix: ""
-    featured: "Включает"
-    not_featured: "Не включает"
-    looking_for: "Ищет:"
-    last_updated: "Последнее обновление:"
-    contact: "Связаться"
-    active: "Ищу предложения работы в настоящее время"
-    inactive: "Не ищу предложений работы в настоящее время"
-    complete: "готово"
-    next: "Далее"
-    next_city: "Город?"
-    next_country: "Выберите вашу страну."
-    next_name: "имя?"
-    next_short_description: "напишите короткое описание."
-    next_long_description: "опишите желаемую позицию"
-    next_skills: "Опишите хотя бы пять своих навыков"
-    next_work: "Опишите ваш опыт работы"
-    next_education: "recount your educational ordeals"
-    next_projects: "Покажите нам три своих проекта"
-    next_links: "добавьте ссылки на личные сайты или соц. сети"
-    next_photo: "добавьте необязательное профессиональное фото"
-    next_active: "пометьте себя как ищущего предложения для отображения поиском."
-    example_blog: "Блог"
-    example_personal_site: "Персональный сайт"
-    links_header: "Персональные ссылки"
-    links_blurb: "Ссылки на другие сайты или профили, которые вы хотите указать Например: Аккаунт на GitHub'е, на LinkedIn'е, или на вашем блоге."
-    links_name: "Название ссылки"
-    links_name_help: "На что вы ссылаетесь?"
-    links_link_blurb: "URL ссылки"
-    basics_header: "Обновить базовую информацию."
-    basics_active: "Ищет предложения"
-    basics_active_help: "Вы хотите поискать предложения прямо сейчас?"
-    basics_job_title: "Предпочитаемая роль в работе"
-    basics_job_title_help: "Какую роль вы хотите?"
-    basics_city: "Город"
-    basics_city_help: "Город, в котором вы живете или хотели ли бы работать."
-    basics_country: "Страна"
-    basics_country_help: "Страна, в которой вы хотите работать (или живете сейчас)."
-    basics_visa: "Статус работы в США"
-    basics_visa_help: "У вас есть разрешение на работу в США, или вам понадобится помощь в получении визы? (Если вы живете в Канаде или Австралии, отметьте \"есть разрешение\".)"
-    basics_looking_for: "Ищу"
-    basics_looking_for_full_time: "Полная занятость"
-    basics_looking_for_part_time: "Частичная занятость"
-    basics_looking_for_remote: "Удаленная работа"
-    basics_looking_for_contracting: "Контракт"
-    basics_looking_for_internship: "Практика"
-    basics_looking_for_help: "Какого рода разработчиком вы хотете быть?"
-    name_header: "Заполните ваше имя"
-    name_anonymous: "Анонимный разработчик"
-    name_help: "Ваше имя для представления работодателям, например, 'Nick Winter'."
-    short_description_header: "Напишите пару строк о себе"
-    short_description_blurb: "Добавьте слоган, чтобы помочь работодателям быстро узнать больше о вас."
-    short_description: "Слоган"
-    short_description_help: "Кто вы и что вы ищите? 140 символов максимум."
-    skills_header: "Навыки"
-    skills_help: "Расположите актуальные навыки разработчика в порядке мастерства."
-    long_description_header: "Опишите вашу желаемую позицию"
-    long_description_blurb: "Расскажите работодателям, как вы круты, и какую роль вы хотите."
-    long_description: "Описание себя"
-    long_description_help: "Опишите себя потенциальным работодателям. Будьте кратки и по существу. Мы рекомендуем исходить из позиции наиболее интересного вам. 600 символов максимум."
-    work_experience: "Опыт работы"
-    work_header: "Опишите ваш опыт работы"
-    work_years: "Годы опыта"
-    work_years_help: "Сколько лет профессионального опыта (с получением денег) разработки ПО вы имеете?"
-    work_blurb: "Напишите ваш рабочий опыт, начиная с последнего времени."
-    work_employer: "Работодатель"
-    work_employer_help: "Наименование вашего работодателя"
-    work_role: "Должность"
-    work_role_help: "Какова была ваша должность или роль?"
-    work_duration: "Продолжительность"
-    work_duration_help: "Как долго вы работали в этой должности?"
-    work_description: "Описание"
-    work_description_help: "Что вы делали? (140 символов; опционально)"
-    education: "Образование"
-    education_header: "Укажите ваше образование"
-    education_blurb: "Список ваших учебных испытаний."
-    education_school: "Учебное заведение"
-    education_school_help: "Наименование учебного заведения."
-    education_degree: "Степень"
-    education_degree_help: "Какова ваша степень и область исследования?"
-    education_duration: "Даты"
-    education_duration_help: "Когда?"
-    education_description: "Описание"
-    education_description_help: "Выделите что-нибудь из этого учебного опыта. (140 символов; опционально)"
-    our_notes: "Наши заметки"
-    remarks: "Замечания"
-    projects: "Проекты"
-    projects_header: "Добавьте 3 проекта"
-    projects_header_2: "Проекты (3 самых лучших)"
-    projects_blurb: "Укажите ваши проекты, чтобы поразить работодателей."
-    project_name: "Название проекта"
-    project_name_help: "Какое у проекта было название?"
-    project_description: "Описание"
-    project_description_help: "Кратко опишите проект."
-    project_picture: "Картинка"
-    project_picture_help: "Загрузите картинку размером 230x115 пикселей или больше, демонстрирующую проект."
-    project_link: "Ссылка"
-    project_link_help: "Ссылка на проект."
-    player_code: "Код игрока"
-
-  employers:
-    deprecation_warning_title: "Извините, в данный момент CodeCombat не набирает новых сотрудников."
-    deprecation_warning: "В настоящее время мы фокусируемся на разработчиков начального уровня нежели опытных."
-    hire_developers_not_credentials: "Нанимаем разработчиков, не данные о них." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Начнем"
-    already_screened: "Мы уже технически просеяли всех наших кандидатов"
-    filter_further: ", но вы можете профильтровать далее:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Разрешение на работу в США"
-    filter_visa_no: "Нет разрешения на работу"
-    filter_education_top: "Высшее образование"
-    filter_education_other: "Другое"
-    filter_role_web_developer: "Веб-разработчик"
-    filter_role_software_developer: "Разработчик ПО"
-    filter_role_mobile_developer: "Разработчик мобильных приложений"
-    filter_experience: "Опыт"
-    filter_experience_senior: "Опытный (Senior)"
-    filter_experience_junior: "Начинающий (Junior)"
-    filter_experience_recent_grad: "Выпускник"
-    filter_experience_student: "Студент"
-    filter_results: "результаты"
-    start_hiring: "Начать наем."
-    reasons: "Три причины, почему вы должны искать работников через нас:"
-    everyone_looking: "Все здесь ищут их следующую возможность."
-    everyone_looking_blurb: "Забудьте о 20% рейтинге откликов через LinkedIn InMail. Каждый в нашем списке хочет найти свое следующее место работы и ответит на ваше приглашение на интервью."
-    weeding: "Расслабьтесь; мы отобрали их для вас.."
-    weeding_blurb: "Каждый игрок в списке был просмотрен на предмет технических способностей. Мы так же ведем телефонные переговоры по выбранным кандидатам и делаем пометки в их профилях, чтобы сэкономить ваше время."
-    pass_screen: "Они пройдут ваш технический отбор."
-    pass_screen_blurb: "Просмотрите код каждого кандидата перед принятием решения. Один работодатель заметил, что количество наших разработчиков, прошедших их технический отбор, в 5 раз превышало число набранных через Hacker News."
-    make_hiring_easier: "Сделайте мой наем сотрудников проще, пожалуйста."
-    what: "Что такое CodeCombat?"
-    what_blurb: "CodeCombat - это многопользовательская браузерная игра про программирование. Игроки пишут код, чтобы контролировать свои войска в битвах против других разработчиков. Наши игроки имеют опыт во всех основных технических областях."
-    cost: "Как много мы просим взамен?"
-    cost_blurb: "Мы просим 15% оплаты за первый год работы и предлагаем 100% гарантию возврата денег в течении 90 дней. Мы не взимаем платы за кандидатов, которые уже были активно проинтервьюированы в вашей компании."
-    candidate_name: "Имя"
-    candidate_location: "Местонахождение"
-    candidate_looking_for: "Ищет"
-    candidate_role: "Роль"
-    candidate_top_skills: "Лучшие навыки"
-    candidate_years_experience: "Лет опыта"
-    candidate_last_updated: "Последнее обновление"
-    candidate_who: "Кто"
-    featured_developers: "Рекомендуемые разработчики"
-    other_developers: "Прочие разработчики"
-    inactive_developers: "Неактивные разработчики"
-
   admin:
     av_espionage: "Разведка" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Почта или юзернейм"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     av_entities_sub_title: "Сущности"
     av_entities_users_url: "Пользователи"
     av_entities_active_instances_url: "Активные экземпляры"
-    av_entities_employer_list_url: "Список работодателей"
-    av_entities_candidates_list_url: "Список кандидатов"
     av_entities_user_code_problems_list_url: "Список проблем с пользовательским кодом"
     av_other_sub_title: "Другое"
     av_other_debug_base_url: "База (для отладки base.jade)"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 573768f5f..1e2e2f92e 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     multiplayer: "Viac hráčov" # Not currently shown on home page
     for_developers: "Pre vývojárov" # Not currently shown on home page.
     or_ipad: "Alebo stiahni pre iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Hraj" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     creating: "Vytvára sa účet..."
     sign_up: "Registruj sa"
     log_in: "prihlás sa pomocou hesla"
-    social_signup: "Môžeš sa zaregistrovať aj cez Facebook alebo Google+:"
     required: "Najskôr sa musíš prihlásiť."
     login_switch: "Máš už účet ?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     incomplete: "Nekompletné"
     timed_out: "Čas uplynul"
     failing: "Zlyhanie"
-    action_timeline: "Časová os"
-    click_to_select: "Vyberte kliknutím."
     control_bar_multiplayer: "Viac hráčov"
     control_bar_join_game: "Vstúpiť do hry"
     reload: "Znova"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Informácie pre učiteľov"
-    intro_1: "CodeCombat je online hra, ktorá učí programovať. Študenti píšu kód v skutočných programovacích jazykoch."
-    intro_2: "Nie sú nutné žiadne predchádzajúce skúsenosti !"
-    free_title: "Koľko to stojí ?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-    free_1: "CodeCombat Basic is ZDARMA ! K dispozícii je 70+ úrovní pokrývajúcich každý koncept." # {change}
-    free_2: "Mesačné predplatné poskytuje prístup k videonávodom a k úrovniam na precvičenie navyše."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Pre učiteľov je predplatné zdarma !" # {change}
-#    teacher_subs_0: "We offer free trials to teachers."
-    teacher_subs_1: "Napíšte na" # {change}
-    teacher_subs_2: "pre zriadenie mesačného predplatného zdarma." # {change}
-#    teacher_subs_3: "to try out the paid courses."
-    sub_includes_title: "Čo zahrnuje predplatné ?"
-    sub_includes_1: "Študenti s mesačným predplatným získajú ku 70+ základným úrovniam  aj :" # {change}
-    sub_includes_2: "40+ tréningových úrovní" # {change}
-    sub_includes_3: "Video návody"
-    sub_includes_4: "Prémiovú emailovú podporu"
-    sub_includes_5: "7 nových hrdinov s jedinečnými schopnosťami" # {change}
-    sub_includes_6: "3500 bonusových diamantov každý mesiac"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
     who_for_title: "Pre koho je určený CodeComabt ?"
-    who_for_1: "CodeCombat odporúčame pre žiakov od 9 rokov. Nie sú nutné žiadne predchádzajúce skúsenosti s programovaním."
-    who_for_2: "CodeCombat sme navrhli tak, aby oslovil chlapcov aj dievčatá."
-    material_title: "Aký je objem učebnej látky ?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-    material_1: "Asi 8 hodín bezplatného obsahu a ďalších 14 hodín pre predplatiteľov. 5 nových úrovní každý týždeň." # {change}
-    concepts_title: "Aké pojmy sú pokryté ?"
-    how_much_title: "Koľko stojí mesačné predplatné ?"
-    how_much_1: ""
-    how_much_2: "Mesačné predplatné"
-    how_much_3: ", ktoré môže byť kedykoľvek zrušené, stojí 9.99$."
-    how_much_4: "Zľavy pre väčšie skupiny:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+    who_for_1: "CodeCombat odporúčame pre žiakov od 9 rokov. Nie sú nutné žiadne predchádzajúce skúsenosti s programovaním." # {change}
+    who_for_2: "CodeCombat sme navrhli tak, aby oslovil chlapcov aj dievčatá." # {change}
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-    sys_requirements_title: "Systémové požiadavky"
-    sys_requirements_1: "Moderný webový prehliadač. Nové verzie prehliadačov Chrome, Firefox alebo Safari. Internet Explorer 9 alebo novší."
-    sys_requirements_2: "CodeCombat nie je zatiaľ podprovaný pre iPad."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Poslať odozvu"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Nastvenia účtu"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     saved: "Zmeny uložené"
     password_mismatch: "Heslá nesedia."
     password_repeat: "Zopakuj, prosím, svoje heslo."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index bb4db95bd..e3ffe7511 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 04862cca5..aaa29c26c 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Нивои" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     creating: "Прављење налога..."
     sign_up: "Упиши се"
     log_in: "улогуј се са шифром"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-    action_timeline: "Временска линија акције"
-    click_to_select: "Кликни на јединицу да је селектујеш"
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Пошаљи повратну информацију"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Подешавања налога"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     saved: "Измене су сачуване"
     password_mismatch: "Шифре се не слажу."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Налог за "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index d955bad63..35a9eeee5 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     multiplayer: "Flera spelare" # Not currently shown on home page
     for_developers: "För utvecklare" # Not currently shown on home page.
     or_ipad: "Eller ladda ner till iPad"
-    hoc_class_code: "Jag har en lektionskod"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Spela" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     creating: "Skapar konto..."
     sign_up: "Skapa konto"
     log_in: "logga in med lösenord"
-    social_signup: "Eller så kan du logga in genom facebook eller G+:"
     required: "Du måste logga in innan du kan gå dit"
     login_switch: "Har du redan ett konto?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     incomplete: "Ej färdig"
     timed_out: "Slut på tid"
     failing: "Ingen framgång"
-    action_timeline: "Händelse-tidslinje"
-    click_to_select: "Klicka på en enhet för att välja den."
 #    control_bar_multiplayer: "Multiplayer"
     control_bar_join_game: "Anslut till spel"
     reload: "Ladda om"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     josh_c_blurb: "Designar spel"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Info till lärare"
-    intro_1: "CodeCombat är ett onlinespel som lär ut programmering. Eleverna skriver kod i riktiga programspråk."
-    intro_2: "Ingen erfarenhet krävs!"
-    free_title: "Hur mycket kostar det?"
-    cost_premium_server: "CodeCombat har 5 gratisnivåer, efter det kostar det $9.99 USD per månad om du vill ha tillgång till våra mer än 190+ nivåer på våra landsspecifika servrar."
-    free_1: "CodeCombat Basic är GRATIS! Det finns över 80 gratis nivåer som täcker alla koncept." # {change}
-    free_2: "En månadsprenumeration ger tillgång till videogenomgångar och fler övningsnivåer."
-    free_3: "Innehållet i CodeCombat är uppdelat i"
-    free_4: "lektioner"
-    free_5: ".  Den första lektionen är gratis och innehåller material för ungefär en timme."
-    free_6: "Ytterligare lektioner kan låsas upp med en engångsbetalning."
-    teacher_subs_title: "Lärare får gratis prenumerationer!" # {change}
-    teacher_subs_0: "Lärare kan testa gratis."
-    teacher_subs_1: "Kontakta" # {change}
-    teacher_subs_2: "för att sätta upp en gratis månadsprenumeration." # {change}
-    teacher_subs_3: "för att gratis testa betallektionerna."
-    sub_includes_title: "Vad ingår i prenumerationen?"
-    sub_includes_1: "Förutom de 80+ grundläggande nivåerna får elever med en månadsprenumeration tillgång till följande:" # {change}
-    sub_includes_2: "60+ övningsnivåer" # {change}
-    sub_includes_3: "Videogenomgångar"
-    sub_includes_4: "Premium mejlsupport"
-    sub_includes_5: "7 nya hjältar med unika färdigheter att bemästra" # {change}
-    sub_includes_6: "3500 bonusädelstenar varje månad"
-    sub_includes_7: "Privata klaner"
-    monitor_progress_title: "Hur kan jag se elevernas framsteg?"
-    monitor_progress_1: "Du kan skapa en"
-    monitor_progress_2: "till din klass."
-    monitor_progress_3: "För att lägga till en elev, skicka en inbjudan till din klan. Finns på den här sidan: "
-    monitor_progress_4: ""
-    monitor_progress_5: "Efter att de anslutit ser du en sammanfattning av elevens framsteg på din klans sida."
-    private_clans_1: "Privata klaner ger ökad integritet och detaljerad framstegsinformation för varje elev."
-    private_clans_2: "För att skapa en privat klan, använd kryssrutan 'Gör klanen privat' när du skapar en"
-    private_clans_3: "."
     who_for_title: "Vem är CodeCombat för?"
-    who_for_1: "Vi rekommenderar CodeCombat till elever som är minst 9 år. Inga programmeringskunskaper krävs."
-    who_for_2: "Vi har skapat CodeCombat för att locka både pojkar och flickor."
-    material_title: "Hur mycket material finns det?"
-    material_premium_server: "Ungefär 30 timmars speltid över 140+ prenumerantnivåer - än så länge - med nya nivåer varje vecka." # {change}
-    material_1: "Ungefär 10 timmar fritt innehåll och ytterligare 20 timmar prenumerantinnehåll med nya nivåer varje vecka." # {change}
-    concepts_title: "Vilka koncept täcks?"
-    how_much_title: "Hur mycket kostar en månadsprenumeration?"
-    how_much_1: "En"
-    how_much_2: "månadsprenumeration"
-    how_much_3: "kostar $9.99 och kan avbrytas när som helst."
-    how_much_4: "Dessutom ger vi rabatt till större grupper:"
-    how_much_5: "Vi gör engångsköp med avdrag och årliga prenumerationer för grupper, som en klass eller skola. Kontakta"
-    how_much_6: "för mer information."
+    who_for_1: "Vi rekommenderar CodeCombat till elever som är minst 9 år. Inga programmeringskunskaper krävs." # {change}
+    who_for_2: "Vi har skapat CodeCombat för att locka både pojkar och flickor." # {change}
     more_info_title: "Var kan jag hitta mer information?"
     more_info_1: "Vårt"
     more_info_2: "lärarforum"
     more_info_3: "är ett bra ställe att skapa kontakter med andra lärare som använder CodeCombat."
-    sys_requirements_title: "Systemkrav"
-    sys_requirements_1: "En modern webbläsare. Nyare versioner av Chrome, Firefox, eller Safari. Internet Explorer 9 eller senare."
-    sys_requirements_2: "CodeCombat stöds inte på iPad än."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     screenshot_included: "Inkluderar skärmbild."
     where_reply: "Vart ska vi skicka svaret?"
     send: "Skicka Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Kontoinställningar"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     saved: "Ändringar sparade"
     password_mismatch: "De angivna lösenorden stämmer inte överens."
     password_repeat: "Upprepa ditt lösenord."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-    view_profile: "Visa din profil"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Kortkommandon"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     subs_only: "endast följare"
     create_clan: "Skapa ny klan"
     private_preview: "Förhandsgranska"
+#    private_clans: "Private Clans"
     public_clans: "Publik klan"
     my_clans: "Mina klaner"
     clan_name: "Klanens namn"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     payments: "Betalningar"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
     subscription: "Prenumeration"
     invoices: "Fakturor"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     email_settings_url: "dina mejlinställningar"
     email_description_suffix: "eller genom länkar i mejlen vi skickar kan du ändra dina inställningar och lätt avprenumerera när som helst."
     cost_title: "Kostnad"
-    cost_description: "För närvarande är CodeCombat 100 % gratis! Ett av våra främsta mål är att behålla det så, så att så många som möjligt kan spela, oavsett plats i livet. Om himlen mörknar, kanske vi behöver ta betalt för prenumerationer eller något innehåll, men helst slipper vi det. Med lite tur lyckas vi hålla liv i företag med:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Upphovsrätt och licenser"
     contributor_title: "Överenskommelse för bidragarlicens"
     contributor_description_prefix: "Alla bidrag, både på sajten och på vårt GitHub-repo, faller under vår"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     nutshell_title: "I ett nötskal"
     nutshell_description: "Alla resurser vi tillhandahåller i nivåredigeraren är gratis att använda som du vill för att skapa nivåer. Men vi reserverar oss rättigheten att begränsa distribution av nivåerna själva (som skapas på codecombat.com) så att de kan tas betalt för i framtiden, om det är så det blir."
     canonical: "Den engelska versionen av detta dokument är den definitiva, erkända versionen. Om det finns några skillnader mellan översättningar är det det engelska dokumentet som tar företräde."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "Profil för "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     av_entities_sub_title: "Enheter"
     av_entities_users_url: "Användare"
     av_entities_active_instances_url: "Aktiva instanser"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Övrigt"
     av_other_debug_base_url: "Base (för avlusning av base.jade)"
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 2b434fe13..8027a476a 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "เล่น" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     creating: "กำลังสร้างบัญชีใหม่..."
     sign_up: "สมัคร"
     log_in: "เข้าสู่ระบบด้วยรหัสผ่าน"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     incomplete: "ไม่สมบูรณ์"
     timed_out: "หมดเวลา"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     parents_title: "ถึงผู้ปกครอง : ลูกของคนกำลังฝึกเขียนโปรแกรมอยู่ คุณจะช่วยให้เขาเขียนต่อไหม"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-    group_discounts_1st: "สมัคร 1 คน"
-    group_discounts_full: "ราคาเต็ม"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-    group_discounts_12th: "สมัคร 12 คนขึ้นไป"
-    group_discounts_40: "ลด 40%"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     saved: "เปลี่ยนรหัสผ่าน"
     password_mismatch: "รหัสผ่านไม่ถูกต้อง"
     password_repeat: "จงใส่รหัสผ่านอีกครั้ง"
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
   keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index 32d0b55c4..372164084 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     multiplayer: "Çoklu-oyuncu Kipi" # Not currently shown on home page
     for_developers: "Geliştiriciler için" # Not currently shown on home page.
     or_ipad: "Ya da iPad için indir"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Oyna" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     creating: "Hesap oluşturuluyor..."
     sign_up: "Kaydol"
     log_in: "buradan giriş yapabilirsiniz."
-    social_signup: "veya Facebook ya da G+ ile oturum açabilirsiniz:"
     required: "Buraya gidebilmeniz için oturum açmanız gerekli."
     login_switch: "Zaten bir hesabın var mı?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     incomplete: "Tamamlanmamış"
     timed_out: "Süre bitti"
     failing: "Başarısız"
-    action_timeline: "Eylem Çizelgesi"
-    click_to_select: "Birimi seçmek için üzerine tıklayın."
     control_bar_multiplayer: "Çoklu Oyuncu"
     control_bar_join_game: "Oyuna Katıl"
     reload: "Yeniden Yükle"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Gönder"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Hesap Ayarları"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     saved: "Değişiklikler Kaydedildi"
     password_mismatch: "Şifreler Uyuşmuyor"
     password_repeat: "Lütfen şifrenizi yenileyin."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-    sample_profile: "Örnek bir profil gör"
-    view_profile: "Kendi Profilinize Bakın"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Klavye Kısayolları"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     payments: "Ödemeler"
 #    prepaid_codes: "Prepaid Codes"
     purchased: "Ödendi"
-    sale: "İndirim"
     subscription: "Üyelik"
     invoices: "Faturalar"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     email_settings_url: "eposta ayarları sayfasından,"
     email_description_suffix: "ister size gönderdiğimiz epostadaki linklerden, tercihlerinizi değiştirebilir ve aboneliğinizi anında iptal edebilirsiniz."
     cost_title: "Ücret"
-    cost_description: "Şu anda CodeCombat tamamıyla ücretsiz! Esas amaçlarımızdan biri bu şekilde devam etmek, bu sayede hayattaki konumu fark etmeksizin olabildiğince çok insan oynayarak kodlamayı öğrenebilir. Eğer koşullar olumsuz yönde değişirse, abonelik veya bazı içerikler için belirli ücretler talep edilebilir, ama bunu tercih etmeyiz. Temennimiz şudur ki, şirketi şu biçimde sürdürmeye devam edebiliriz:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Telif Hakları ve Lisanslar"
     contributor_title: "Katılımcı Lisans Sözleşmesi"
     contributor_description_prefix: "GitHub ve siteye yapılan tüm katılımlar, devam etmeden önce kabul etmeniz gereken"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     nutshell_title: "Özetle"
     nutshell_description: "Seviye editöründe sağladığımız tüm içerik, seviye düzenleme sırasında kullanmanız için uygundur. Fakat ileride bu öğelerin kullanımını kısıtlama hakkını saklı tutmaktayız."
     canonical: "Belirleyici, hukuki nitelikte olan, bu dökümanın İngilizce sürümüdür. Çeviriler arasında tutarsızlık olması halinde İngilizce dökümanda yer alan hüküm dikkate alınacaktır."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-    profile_for_suffix: " Kullanıcısının Profili"
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     av_entities_sub_title: "Ortaklıklar"
     av_entities_users_url: "Kullanıcılar"
     av_entities_active_instances_url: "Aktif Örnekler"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Başka"
     av_other_debug_base_url: "Temel (base.jade hata kontrolü)"
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 2750110d8..c3ac2d8f7 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     multiplayer: "Командна гра" # Not currently shown on home page
     for_developers: "Для розробників" # Not currently shown on home page.
     or_ipad: "Або завантажте на iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Грати" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     creating: "Створення екаунту..."
     sign_up: "Реєстрація"
     log_in: "вхід з паролем"
-    social_signup: "Або Ви можете створити акаунт через Facebook чи G+:"
     required: "Ця дія потребує входу."
     login_switch: "Уже маєте екаунт?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     incomplete: "Незавершено"
     timed_out: "Час очікування минув"
     failing: "Невдало"
-    action_timeline: "Лінія часу"
-    click_to_select: "Клікніть на підрозділ, аби вибрати його."
     control_bar_multiplayer: "Мультиплеєр"
     control_bar_join_game: "Приєднатись до гри"
     reload: "Перезавантажити "
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Українська", englishDescription:
     parents_title: "Дорога мамо/батьку, ваша дитина вчиться програмувати. Чи допоможите ви їй продовжити цю спрову?"
     parents_blurb1: "Ваша дитина уже завершила __nLevels__ рівнів та вивчила базові речі. Допоможіть культивувати її інтерес та придбайте їй абонемент аби вона могла продовжити грати."
     parents_blurb1a: "Коп'ютерне програмування є необхідними вмінням, що ваша дитина беззаперечно використовуватиме у дорослому віці. До 2020 року 77% професій потребуватимуть базових навичок у програмному забезпечені, а програмісти надзвичайно потрібні у всьому світі. Чи знали ви, що Комп'ютерні Науки - це найбільш високооплачувана університетьська спеціальність?"
-    parents_blurb2: "За 9.99$ на місяць, вона отримуватиме нові завдання щотижня та персональні листи підтримки від професійних програмістів." # {change}
+    parents_blurb2: "За {{price}}$ на місяць, вона отримуватиме нові завдання щотижня та персональні листи підтримки від професійних програмістів." # {change}
     parents_blurb3: "Жодного ризику: 100% гарантія повернення грошей, легке скасування абонементу одним кліком."
     payment_methods: "Платіжні методи"
     payment_methods_title: "Платіжні методи, що приймаються"
     payment_methods_blurb1: "Наразі ми приймаємо кредитні картки та Alpiay." # {change}
     payment_methods_blurb2: "Якщо Вам необхідно використати інший спосіб оплати, будь ласка, зв'яжіться з нами."
-    sale_already_subscribed: "Ви вже підписалися!"
-    sale_blurb1: "Зекономте $21" # {change}
-    sale_blurb2: "від звичайної ціни у 120$ на рік!"
     sale_button: "Розпродаж!"
-    sale_button_title: "Збережіть $21 при покупці абонементу на 1 рік" # {change}
-    sale_click_here: "Натисніть тут"
-    sale_ends: "Kінець"
-    sale_extended: "*Існуючі підписки буде продовжено на 1 рік."
-    sale_feature_here: "Ось те, що ви отримаєте:"
-    sale_feature2: "Доступ до 9 потужних <strong>нових героїв</strong> з унікальними вміннями!"
-    sale_feature4: "Миттєве отримання <strong> 42000 бонусних самоцвітів</strong>!"
-    sale_continue: "Готовий продовжити пригоди?"
-    sale_limited_time: "Обмежена пропозиція!"
-    sale_new_heroes: "Нові герої!"
-    sale_title: "Дошкільні знижки"
-    sale_view_button: "Купити 1 рік підписки на"
+    sale_button_title: "Збережіть ${{discount}} при покупці абонементу на 1 рік" # {change}
     stripe_description: "Щомісячний абонемент"
-    stripe_description_year_sale: "1 рік підписки ($21 знижка)" # {change}
+    stripe_description_year_sale: "1 рік підписки (${{discount}} знижка)" # {change}
     subscription_required_to_play: "Аби грати в цьому рівні потрібен абонемент."
     unlock_help_videos: "Підпишіться, щоб відкрити усі навчальні відео."
     personal_sub: "Особистий абонемент" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     currently_free_until: "Зараз у Вас безкоштовний абонемент до "
     was_free_until: "У Вас був безкоштовний абонемент до "
     managed_subs: "Керовані абонементи"
-    managed_subs_desc: "Додати абонементи для інших гравців (учнів, дітей тощо)"
-    managed_subs_desc_2: "Одержувачі повинні мати обліковий запис CodeCombat, пов'язаний з вказаною Вами адресою електронної пошти."
-    group_discounts: "Групові знижки"
-    group_discounts_1: "Ми також пропонуємо знижки для пакетних передплат."
-    group_discounts_1st: "1-ий абонемент"
-    group_discounts_full: "Повна ціна"
-    group_discounts_2nd: "2-11 абонементи"
-    group_discounts_20: "Знижка 20%"
-    group_discounts_12th: "Абонементи від 12-го"
-    group_discounts_40: "Знижка 40%"
     subscribing: "Передплата..."
-    recipient_emails_placeholder: "Введіть ел. адреси для передплати, по одній в рядку."
-    subscribe_users: "Підписати користувачів"
-    users_subscribed: "Підписані користувачі:"
-    no_users_subscribed: "Користувачі не підписані, будь ласка, перевірте Ваші ел. адреси."
     current_recipients: "Поточні отримувачі"
     unsubscribing: "Триває скасування підписки..."
     subscribe_prepaid: "Натисніть Підписатися щоб використовувати передплачені коди"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "Додаткова інформація для вчителів"
-    intro_1: "CodeCombat - це онлайн гра, що вчить програмуванню. Студенти пишуть код на реальних мовах програмування."
-    intro_2: "Досвід не потрібен!"
-    free_title: "Скільки це коштує?"
-    cost_premium_server: "CodeCombat безкоштовний протягом перших п'яти рівнів, після чого він коштуватиму 9,99$ на місяць за доступ до інших наших 190+ рівнів на наших ексклюзивних серверах."
-    free_1: "Є 110+ БЕЗКОШТОВНИХ рівнів, які охоплюють всі поняття."
-    free_2: "Місячний абонемент надає доступ до відео-уроків і додаткових рівнів практики."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "Вчителі отримують безкоштовні підписки!" # {change}
-    teacher_subs_0: "Ми пропонуємо безкоштовну передплату для тестування студентів." # {change}
-    teacher_subs_1: "Будь ласка, заповніть "
-    teacher_subs_2: "Анкету Вчителя"
-    teacher_subs_3: "щоб налаштувати підписку." # {change}
-    sub_includes_title: "Що входить у підписку?"
-    sub_includes_1: "На додаток до 110+ основних рівнів, студенти з щомісячною підпискою отримають доступ до цих додаткових функцій:"
-    sub_includes_2: "80+ рівнів практики"
-    sub_includes_3: "Відео-уроки"
-    sub_includes_4: "Преміум-підтримка електронною поштою"
-    sub_includes_5: "10 нових героїв з унікальними вміннями якими можна оволодіти"
-    sub_includes_6: "3500 бонусних самоцвітів кожен місяць"
-    sub_includes_7: "Приватні клани"
-    monitor_progress_title: "Як мені стежити за прогресом студентів?"
-    monitor_progress_1: "Прогрес студентів можна відстежувати, створивши"
-    monitor_progress_2: "для вашого класу."
-    monitor_progress_3: "Щоб додати студентів, надішліть їм посилання-запрошення в ваш Клан, яке можна знайти на"
-    monitor_progress_4: "сторінці."
-    monitor_progress_5: "Після того, як вони приєднаються, ви побачите зведення по прогрес студентів на сторінці вашого Клану."
-    private_clans_1: "Приватні Клани забезпечують підвищену конфіденційність і детальну інформацію про прогрес кожного студента."
-    private_clans_2: "Щоб створити приватний Клан, відзначте прапорець 'Зробити клан приватним', коли будете створювати"
-    private_clans_3: "."
     who_for_title: "Для кого призначений CodeCombat?"
-    who_for_1: "Ми рекомендуємо CodeCombat для учнів старше 9 років. Попередній досвід програмування не потрібен."
-    who_for_2: "Ми розробили CodeCombat так, щоб він підходив і хлопчикам і дівчаткам."
-    material_title: "Як багато тут матеріалу?"
-    material_premium_server: "Близько 50 годин ігрового процесу, розподіленого більш ніж на 190 рівнів для передплатників."
-    material_1: "Приблизно 25 годин безкоштовного контенту і додаткові 15 годин контенту для передплатників."
-    concepts_title: "Про які концепти ми розповідаємо?"
-    how_much_title: "Скільки коштує місячний абонемент?"
-    how_much_1: ""
-    how_much_2: "Місячний абонемент"
-    how_much_3: "коштує 9.99$, та може бути скасованим будь-коли."
-    how_much_4: "Крім цього, ми надаємо знижки для великих груп:"
-    how_much_5: "Ми надаємо знижку на разові закупівлі та річну передплату для груп, як-от клас або школа. Будь ласка, зв'яжіться з нами"
-    how_much_6: "для отримання більш детальної інформації."
+    who_for_1: "Ми рекомендуємо CodeCombat для учнів старше 9 років. Попередній досвід програмування не потрібен." # {change}
+    who_for_2: "Ми розробили CodeCombat так, щоб він підходив і хлопчикам і дівчаткам." # {change}
     more_info_title: "Де я можу знайти більше інформації?"
     more_info_1: "Наш"
     more_info_2: "вчительський форум"
     more_info_3: "є гарним місцем для спілкування із колегами-педагогами, котрі використовують CodeCombat."
-    sys_requirements_title: "Системні вимоги"
-    sys_requirements_1: "Сучасний веб-переглядач. Остання версія Chrome, Firefox або Safari. Internet Explorer 9 та вище."
-    sys_requirements_2: "CodeCombat наразі не підтримується на iPad."
 
   teachers_survey:
     title: "Анкета вчителя"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     screenshot_included: "Приєднано зняток."
     where_reply: "Куди ми повинні відповісти?"
     send: "Надіслати відгук"
-    contact_candidate: "Сконтактуватися з кандидатом" # Deprecated
-    recruitment_reminder: "Використовуйте цю форму, щоб перейти до кандидатів, з котрими Ви б хотіли провести співбесіду. Пам'ятайте, що CodeCombat знімає 18% ЗП за перший рік. Плата проводиться за наймом співробітника і підлягає відшкодуванню протягом 90 днів якщо працівник не залишить роботу. Часткова зайнятість, дистанційна робота та наймані працівники не оплачуються, так само як інтерни." # Deprecated
 
   account_settings:
     title: "Налаштування акаунта"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     saved: "Зміни збережено"
     password_mismatch: "Паролі не збігаються."
     password_repeat: "Будь ласка, повторіть пароль."
-    job_profile: "Робочий профіль" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "Ваш робочий профіль буде затверджено CodeCombat. Роботодавці зможуть бачити його, якщо він буде відмічений як активний або він не зазнає змін протягом 4 тижнів."
-    job_profile_explanation: "Привіт! Заповніть це і ми зв'яжемось з Вами, знайшовши для Вас роботу розробника ПЗ."
-    sample_profile: "Дивитися зразок профілю"
-    view_profile: "Переглянути Ваш профіль"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Клавіатурні скорочення"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     subs_only: "лише для підписників"
     create_clan: "Створити новий клан"
     private_preview: "Прев'ю"
+#    private_clans: "Private Clans"
     public_clans: "Публічні клани"
     my_clans: "Мої клани"
     clan_name: "Назва клану"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     payments: "Платежі"
     prepaid_codes: "Передплачені коди"
     purchased: "Придбано"
-    sale: "Розпродаж"
     subscription: "Підписка"
     invoices: "Рахунки"
     service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     email_settings_url: "налаштування Вашого email"
     email_description_suffix: "або через посилання в повідомленнях, котрі ми присилаємо, Ви можете змінити свої уподобання і легко відмовитись від підписки в будь-який час."
     cost_title: "Вартість"
-    cost_description: "На даний час, CodeCombat є безкоштовним на усі 100%! Однією з наших цілей є рухатись у цьому ж напрямку, так що у цю гру можуть грати так багато людей, наскільки це можливо, незалежно від місця проживання. Якщо настануть важкі часи, ми будемо змушені стягувати плату за певний контент, але ми б не хотіли цього. Якщо пощастить, ми зможемо підтримувати компанію разом з:"
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Авторські права та ліцензії"
     contributor_title: "Авторська ліцензійна згода"
     contributor_description_prefix: "Усі права, як на сайті так і у нашому сховищі GitHub, є у відповідності з нашими"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Українська", englishDescription:
     nutshell_title: "Коротко"
     nutshell_description: "Будь-які ресурси, котрі ми надаємо в редакторі рівнів, є безкоштовними для використання за Вашим бажанням для створення рівнів. Але ми залишаємо за собою право обмежувати розповсюдження самих рівнів (котрі були створені на codecombat.com), тому в майбутньому за них може стягуватися плата, якщо в кінцевому результаті таке станеться."
     canonical: "Англомовна версія цього документа є остаточною та канонічною версією. Якщо є будь-які невідповідності в перекладі, англійська версія документа є пріоритетною."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Нагороди за турнір" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     license: "ліцензія"
     oreilly: "електронна книга на ваш вибір"
 
-  account_profile:
-    settings: "Налаштування" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "Редагувати профіль"
-    done_editing: "Завершити редагування"
-    profile_for_prefix: "Профіль для "
-    profile_for_suffix: ""
-    featured: "Включає"
-    not_featured: "Не включає"
-    looking_for: "Шукає:"
-    last_updated: "Останнє оновлення:"
-    contact: "Сконтактуватись"
-    active: "Шукаю пропозиції роботи в даний час"
-    inactive: "Не шукаю пропозицій роботи в даний час"
-    complete: "Готово"
-    next: "Далі"
-    next_city: "місто?"
-    next_country: "виберіть вашу країну."
-    next_name: "ім'я?"
-    next_short_description: "напишіть короткий опис."
-    next_long_description: "опишіть бажану позицію."
-    next_skills: "опишіть щонайменше п'ять своїх навичок."
-    next_work: "опишіть ваш досвід роботи."
-    next_education: "розкажіть про вашу освіту."
-    next_projects: "опишіть нам три проекта над якими ви працювали."
-    next_links: "додайте посилання на особисту сторінку або соц. мережі."
-    next_photo: "додайте необов’язкове професійне фото."
-    next_active: "відзначте що Ви у пошуках пропозицій, щобвідображатися у пошуку."
-    example_blog: "Блог"
-    example_personal_site: "Персональний сайт"
-    links_header: "Особисті Посилання"
-    links_blurb: "Посилання на інші сторінки або профілі, які б ви хотіли вказати. Наприклад: аккаунт на GitHub'і, LinkedIn, або ваш блог. "
-    links_name: "Назва посилання"
-    links_name_help: "На що Ви посилаєтесь?"
-    links_link_blurb: "URL посилання"
-    basics_header: "Поновити базову інформацію"
-    basics_active: "У пошуках пропозицій"
-    basics_active_help: "Шукати пропозиціі прямо зараз?"
-    basics_job_title: "Бажана позиція у роботі"
-    basics_job_title_help: "Яку роль Ви шукаєте?"
-    basics_city: "Місто"
-    basics_city_help: "Місто, в якому б Ви хотіли працювати (або зараз проживаєте)."
-    basics_country: "Країна"
-    basics_country_help: "Країна, в якій Ви хотіли б працювати (або зараз живете)."
-    basics_visa: "Робочий статус у США"
-    basics_visa_help: "У Вас є право на роботу у США чи Вам потрібна допомога з отриманням візи? (Якщо проживаєте у Канаді чи Австралії, вкажіть, як перше.)"
-    basics_looking_for: "Шукаю"
-    basics_looking_for_full_time: "Повна"
-    basics_looking_for_part_time: "Часткова"
-    basics_looking_for_remote: "Віддалена"
-    basics_looking_for_contracting: "За контрактом"
-    basics_looking_for_internship: "Стажування"
-    basics_looking_for_help: "Яку посаду розробника Ви б хотіли?"
-    name_header: "Введіть своє ім'я"
-    name_anonymous: "Анонімний розробник"
-    name_help: "Ім'я, яке Ви хочете повідомити своїм роботодавців, напр., 'Nick Winter'."
-    short_description_header: "Коротко розкажіть про себе"
-    short_description_blurb: "Додайте слоган, за яким роботодавець швидко складе уявлення про Вас."
-    short_description: "Слоган"
-    short_description_help: "Хто Ви і чого шукаєте? Макс. 140 символів."
-    skills_header: "Навички"
-    skills_help: "Вкажіть відповідні розробницькі навички за досвідченістю."
-    long_description_header: "Опишіть бажану посаду"
-    long_description_blurb: "Розкажіть роботодавцям, які Ви чудові і яку роль для себе хочете."
-    long_description: "Представлення"
-    long_description_help: "Опишіть себе потенційним роботодавцям. Коротко і по суті. Рекомендуємо підкреслити позицію, яка найбільше Вас цікавить. Допустима доречна розмітка, макс. 600 символів."
-    work_experience: "Досвід роботи"
-    work_header: "Вкажіть хроніку своєї історії роботи"
-    work_years: "Роки досвіду"
-    work_years_help: "Скільки у Вас років досвіду професійної розробки програмного забезпечення (з отриманням платні)?"
-    work_blurb: "Список відповідного досвіду роботи, від най свіжішого."
-    work_employer: "Роботодавець"
-    work_employer_help: "Ім'я Вашого роботодавця."
-    work_role: "Назва посади"
-    work_role_help: "Як називалась Ваша посада чи роль?"
-    work_duration: "Тривалість"
-    work_duration_help: "Як довго ви працювали на цій посаді?"
-    work_description: "Опис"
-    work_description_help: "Що Ви там робили? (140 символів; необов'язково)"
-    education: "Освіта"
-    education_header: "Вкажіть вашу освіту"
-    education_blurb: "Перелік ваших навчальних випробувань"
-    education_school: "Школа"
-    education_school_help: "Найменування навчального закладу."
-    education_degree: "Ступінь"
-    education_degree_help: "Яка ваша ступінь і область дослідження?"
-    education_duration: "Дати"
-    education_duration_help: "Коли?"
-    education_description: "Опис"
-    education_description_help: "Виділіть що-небудь з цього навчального досвіду. (140 символів; опціонально)"
-    our_notes: "Наші примітки"
-    remarks: "Примітки"
-    projects: "Роботи"
-    projects_header: "Додайте 3 проекти"
-    projects_header_2: "Проекти (3 найкращих)"
-    projects_blurb: "Вкажіть ваші проекти, щоб вразити роботодавців."
-    project_name: "Назва проекту"
-    project_name_help: "Яка у проекта була назва?"
-    project_description: "Опис"
-    project_description_help: "Коротко опишіть проект."
-    project_picture: "Зображення"
-    project_picture_help: "Завантажте зображення розміром 230x115 пікселів або більше, що демонструє проект."
-    project_link: "Посилання"
-    project_link_help: "Посилання на проект."
-    player_code: "Код гравця"
-
-  employers:
-    deprecation_warning_title: "Вибачте, зараз CodeCombat не пропонує роботу."
-    deprecation_warning: "Наразі ми зосередилися на рівнях для новачків замість пошуків розробників-експертів."
-    hire_developers_not_credentials: "Наймаємо розробників, а не рекомендаційні листи." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Почнемо"
-    already_screened: "Ми вже технічно просіяли всіх наших кандидатів"
-    filter_further: ", але ви можете профільтрувати далі:"
-    filter_visa: "Visa"
-    filter_visa_yes: "Дозвіл на роботу в США"
-    filter_visa_no: "Немає дозволу на роботу"
-    filter_education_top: "Вища освіта"
-    filter_education_other: "Інше"
-    filter_role_web_developer: "веб-розробник"
-    filter_role_software_developer: "розробник програм"
-    filter_role_mobile_developer: "розробник додатків для мобільних"
-    filter_experience: "Досвід"
-    filter_experience_senior: "Досвідчений (Senior)"
-    filter_experience_junior: "Початківець (Junior)"
-    filter_experience_recent_grad: "Випускник"
-    filter_experience_student: "Студент коледжу"
-    filter_results: "результати"
-    start_hiring: "Почати найм."
-    reasons: "Три причини, чому ви повинні шукати працівників через нас:"
-    everyone_looking: "Всі тут шукають їх наступну можливість."
-    everyone_looking_blurb: "Забудьте про 20% рейтинг відгуків через LinkedIn InMail. Кожен в нашому списку хоче знайти своє наступне місце роботи і відповість на ваше запрошення на інтерв'ю."
-    weeding: "Розслабтеся; ми відібрали їх для вас."
-    weeding_blurb: "Кожен гравець у списку був переглянутий на предмет технічних здібностей. Ми так само ведемо телефонні переговори за обраними кандидатам і робимо позначки в їх профілях, щоб заощадити ваш час."
-    pass_screen: "Вони пройдуть ваш технічний відбір."
-    pass_screen_blurb: "Перегляньте код кожного кандидата перед прийняттям рішення. Один роботодавець зауважив, що кількість наших розробників, що пройшли їх технічний відбір, в 5 разів перевищувало число набраних через Hacker News."
-    make_hiring_easier: "Зробіть наймання співробітників простіше, будь ласка."
-    what: "Що таке CodeCombat?"
-    what_blurb: "CodeCombat - це багатокористувальницька браузерна гра про програмування. Гравці пишуть код, щоб контролювати свої війська у битвах проти інших розробників. Наші гравці мають досвід у всіх основних технічних областях."
-    cost: "Як багато ми просимо натомість?"
-    cost_blurb: "Ми просимо 15% оплати за перший рік роботи і пропонуємо 100% гарантію повернення грошей на протязі 90 днів. Ми не стягуємо плати за кандидатів, які вже були активно проінтерв'ювали у вашій компанії."
-    candidate_name: "Ім'я"
-    candidate_location: "Розташування"
-    candidate_looking_for: "Шукає"
-    candidate_role: "Роль"
-    candidate_top_skills: "Найкращі навички"
-    candidate_years_experience: "років досвіду"
-    candidate_last_updated: "Останнє оновлення"
-    candidate_who: "Хто"
-    featured_developers: "Рекомендовані розробники"
-    other_developers: "Інші розробники"
-    inactive_developers: "Неактивні розробники"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "Користвач або email"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     av_entities_sub_title: "Організації"
     av_entities_users_url: "Учасники"
     av_entities_active_instances_url: "Активні вимоги"
-    av_entities_employer_list_url: "Список робітників"
-    av_entities_candidates_list_url: "Список кандидатів"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "Інші"
     av_other_debug_base_url: "Основне (для налагодження base.jade)"
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index 7eb0094e2..83ef0ba44 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/uz.coffee b/app/locale/uz.coffee
index 97485106e..b5c883eaf 100644
--- a/app/locale/uz.coffee
+++ b/app/locale/uz.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index 23fc2cf7c..516524119 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     multiplayer: "Nhiều người chơi" # Not currently shown on home page
     for_developers: "Dành cho nhà phát triển" # Not currently shown on home page.
     or_ipad: "Hoặc tải phiên bản dành cho iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "Chơi" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     creating: "Tạo tài khoản..."
     sign_up: "Đăng ký"
     log_in: "đăng nhập với mật khẩu"
-    social_signup: "Hoặc bạn có thể đăng kí qua Facebook hoặc G+:"
     required: "Bạn cần phải đăng nhập trước khi đi bạn có thể đi hướng đó."
     login_switch: "Bạn đã có tài khoản rồi ?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     incomplete: "Chưa hoàn thành"
     timed_out: "Hết giờ"
     failing: "Đang thua"
-#    action_timeline: "Action Timeline"
-    click_to_select: "Kích vào mục tiêu để chọn nó."
     control_bar_multiplayer: "Nhiều người chơi"
     control_bar_join_game: "Tham gia"
     reload: "Tải lại"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     parents_title: "Con của bạn sẽ học cách viết code (lập trình)." # {change}
     parents_blurb1: "Với CodeCombat, con của bạn sẽ có thể học lập trình bằng việc viết những dòng code thật sự. Con bạn sẽ bắt đầu bằng việc học những lệnh cơ bản, và sau đó sẽ từ từ tìm hiểu về các vấn đề phức tạp hơn."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-    parents_blurb2: "Chỉ với $9.99 USD một tháng, con của bạn sẽ nhận được những thử thách mới mỗi tháng và sẽ nhận được sự hỗ trợ từ các lập trình viên chuyên nghiệp qua email." # {change}
+    parents_blurb2: "Chỉ với ${{price}} USD một tháng, con của bạn sẽ nhận được những thử thách mới mỗi tháng và sẽ nhận được sự hỗ trợ từ các lập trình viên chuyên nghiệp qua email." # {change}
     parents_blurb3: "Không hề có rủi ro: Nếu bạn không hài lòng bạn có thể nhận lại 100% số tiền mình bỏ ra chỉ với 1 cú nhấp chuốt."
     payment_methods: "Những phương thức thanh toán"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
     who_for_title: "CodeCombat dành cho ai ?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-    sys_requirements_2: "Hãy sử dụng phiên bản mới nhất của Chrome hoặc Firefox." # {change}
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "Gởi phản hồi"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "Cài đặt Tài khoản"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     saved: "Thay đổi được lưu"
     password_mismatch: "Mật khẩu không khớp."
     password_repeat: "Hãy nhập lại mật khẩu của bạn một lần nữa."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Các phím tắt"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    subs_only: "subscribers only"
     create_clan: "Tạo một clan mới"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "Các giải thưởng của cuộc thi" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-    done_editing: "Đã chỉnh sửa xong"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-    contact: "Liên lạc"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-    complete: "Hoàn tất"
-    next: "Tiếp"
-    next_city: "Thành phố?"
-    next_country: "Chọn đất nước của bạn."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-    example_blog: "Blog"
-    example_personal_site: "Trang cá nhân"
-    links_header: "Đường truyền cá nhân"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-    links_name: "Tên đường truyền"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-    basics_city: "Thành phố"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-    basics_looking_for_internship: "Thực tập"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-    name_header: "Điền tên của bạn"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-    short_description_header: "Hãy viết một bản giới thiệu ngắn gọn về bạn"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-    skills_header: "Những kĩ năng"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-    long_description_header: "Mô tả công việc mà bạn muốn làm"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "Kinh Nghiệm làm việc"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-    work_role: "Nghề nghiệp"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "Trình độ học vấn"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-    education_school: "Trường"
-#    education_school_help: "Name of your school."
-    education_degree: "Bằng cấp"
-#    education_degree_help: "What was your degree and field of study?"
-    education_duration: "Ngày"
-    education_duration_help: "Khi nào?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-    project_description: "Mô tả"
-#    project_description_help: "Briefly describe the project."
-    project_picture: "Hình Ảnh"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "Bắt Đầu"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-    filter_education_other: "Khác"
-    filter_role_web_developer: "Nhà phát triển web"
-    filter_role_software_developer: "Nhà phát triển phần mềm"
-    filter_role_mobile_developer: "Nhà phát triển phần ứng dụng di động"
-    filter_experience: "Kinh Nghiệm"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-    what: "CodeCombat là gì?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "Tên"
-    candidate_location: "Địa điểm"
-    candidate_looking_for: "Đang tìm kiếm"
-    candidate_role: "Vai trò"
-#    candidate_top_skills: "Top Skills"
-    candidate_years_experience: "Năm kinh nghiệm"
-    candidate_last_updated: "Lần cuối cập nhật"
-    candidate_who: "Người nào"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 04e424d6c..afcf533b9 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     multiplayer: "多人游戏" # Not currently shown on home page
     for_developers: "适合开发者" # Not currently shown on home page.
     or_ipad: "或下载iPad版本"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "关卡选择" # The top nav bar entry where players choose which levels to play
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     creating: "账户创建中……"
     sign_up: "注册"
     log_in: "登录"
-    social_signup: "或者，您可以通过Facebook或Google+注册："
     required: "在做这件事情之前您必须先注册。"
     login_switch: "已经注册过账户?"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "就读学校及所在城市"
+    optional: "选填"
+    school_name_placeholder: "范例: XX中学, 上海"
 
   recover:
     recover_account_title: "找回账户"
@@ -225,10 +221,10 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     years: "年"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "完成关卡:"
+    course: "课程:"
     done: "完成"
-#    next_level: "Next Level:"
+    next_level: "下一个关卡:"
     next_game: "下一场游戏"
     show_menu: "显示游戏菜单"
     home: "主页" # Not used any more, will be removed soon.
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     incomplete: "未完成"
     timed_out: "运行超时"
     failing: "失败"
-    action_timeline: "行动时间轴"
-    click_to_select: "点击选择一个单元。"
     control_bar_multiplayer: "多人游戏"
     control_bar_join_game: "加入游戏"
     reload: "重载"
@@ -348,7 +342,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_free_your_mind: "丢掉一切私心杂念，丢掉害怕、疑问和拒信，解放您的思想。 - Morpheus《黑客帝国》"
     tip_strong_opponents: "即使是最强大的对手也是有弱点的。- 宇智波鼬《火影忍者》"
     tip_paper_and_pen: "在您开始编程之前，您可以随时用一张纸和一支笔提前规划。"
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_solve_then_write: "要先想清楚问题如何解决, 再进行编码的动作. - John Johnson"
 
   game_menu:
     inventory_tab: "道具箱"
@@ -409,7 +403,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     comparison_blurb: "亲，订阅CodeCombat，大力的提升您的技能！"
     feature1: "110+ 基本关卡（4个世界）"
     feature2: "10 个强大 <strong>英雄</strong>以及各式非凡技能!"
-    feature3: "70+ 奖励关卡" # {change}
+    feature3: "80+ 奖励关卡"
     feature4: "每月享有3500额外宝石"
     feature5: "视频教学"
     feature6: "专业邮件支援"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     parents_title: "亲爱的家长: 您的孩子将要学习编程。您会支持孩子发展吗?"
     parents_blurb1: "您的孩子已经玩了 __nLevels__ 关，并且学习了编程基础。请您为了培养他们的兴趣而给他们订阅，他们能继续玩下去。"
     parents_blurb1a: "不用怀疑计算机编程能力将是您的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。您要知道计算机科学是收入最高的大学学位。"
-    parents_blurb2: "每月支付9.99美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。"
+    parents_blurb2: "每月支付{{price}}美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。"
     parents_blurb3: "无风险承诺：100%退款，一键取消订阅。"
     payment_methods: "付费方式"
     payment_methods_title: "可接受的付款方式"
     payment_methods_blurb1: "我们现有的付费方式有信用卡和支付宝" # {change}
     payment_methods_blurb2: "如果您想用其他付费方式,请联系我们"
-    sale_already_subscribed: "您已经订阅!"
-    sale_blurb1: "和正常一年的订阅价格 $120 相比" # {change}
-    sale_blurb2: "年费订阅能节省 $21！"
     sale_button: "促销"
-    sale_button_title: "年费订阅能节省 $21 的费用" # {change}
-    sale_click_here: "点击这里"
-    sale_ends: "结束"
-    sale_extended: "*已订阅用户会续期一年。"
-    sale_feature_here: "你将会获得这些："
-    sale_feature2: "可以使用 10 个强大的 <strong>新英雄</strong> 和各种技能!"
-    sale_feature4: "立即取得 <strong>42,000 个额外的宝石</strong>!"
-    sale_continue: "准备好继续探险吗?"
-    sale_limited_time: "限时优惠!"
-    sale_new_heroes: "新英雄!"
-    sale_title: "开学促销"
-    sale_view_button: "购买年费订阅："
+    sale_button_title: "年费订阅能节省 ${{discount}} 的费用"
     stripe_description: "每月订阅"
-    stripe_description_year_sale: "年费订阅 (优惠 $21)" # {change}
+    stripe_description_year_sale: "年费订阅 (优惠 ${{discount}})" # {change}
     subscription_required_to_play: "订阅后才可开始本关"
     unlock_help_videos: "订阅后才可以解锁视频教学哦！"
     personal_sub: "个人订阅" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     currently_free_until: "您目前有一个订阅，直到"
     was_free_until: "您有过一个免费订阅，直到"
     managed_subs: "管理订阅"
-    managed_subs_desc: "为其他玩家（学生、儿童等）添加订阅。"
-    managed_subs_desc_2: "收件人必须有一个与您提供的电子邮件地址相关联的CodeCombat帐户。"
-    group_discounts: "团购价"
-    group_discounts_1: "我们还为批量订阅提供团购价"
-    group_discounts_1st: "1个订阅"
-    group_discounts_full: "全价"
-    group_discounts_2nd: "2-11个订阅"
-    group_discounts_20: "八折"
-    group_discounts_12th: "12+个订阅"
-    group_discounts_40: "六折"
     subscribing: "订阅中..."
-    recipient_emails_placeholder: "请输入电子邮件地址来订阅，每行一个。"
-    subscribe_users: "订阅用户"
-    users_subscribed: "用户订阅："
-    no_users_subscribed: "没有用户订阅，请仔细检查您的电子邮件地址。"
     current_recipients: "当前收件人"
     unsubscribing: "取消订阅中..." # {change}
     subscribe_prepaid: "点击订阅来使用预付费代码"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     josh_c_blurb: "设计游戏"
     carlos_title: "地区经理, 巴西"
     carlos_blurb: "食草男"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "教师的说明"
-    intro_1: "CodeCombat 是一个教编程的网上游戏。学生会用编程语言写代码。"
-    intro_2: "无需经验!"
-    free_title: "要多少钱?"
-    cost_premium_server: "CodeCombat的前5个关卡是免费的，在这之后需花费每月9.99美元来访问我们架设专属服务器上的190多个关卡。"
-    free_1: "有110多个覆盖了所有理论的免费关卡。"
-    free_2: "包月订阅可以访问视频教程和额外的练习关卡。"
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "教师可免费订阅!" # {change}
-    teacher_subs_0: "我们可为教师提供用于评估的免费订阅。" # {change}
-    teacher_subs_1: "请填写我们的"
-    teacher_subs_2: "教师调查"
-    teacher_subs_3: "建立您的订阅。" # {change}
-    sub_includes_title: "订阅里包含了什么内容？"
-    sub_includes_1: "除了110+个基础关卡，学生包月订阅还可以使用这些附加功能："
-    sub_includes_2: "超过70个练习关卡" # {change}
-    sub_includes_3: "视频教学"
-    sub_includes_4: "优质的电子邮件支持"
-    sub_includes_5: "10个具有独特技能的新英雄"
-    sub_includes_6: "每月享有3500额外宝石"
-    sub_includes_7: "私人部落"
-    monitor_progress_title: "我要如何查看学生的进度？"
-    monitor_progress_1: "要查看学生的进度，可以通过建立一个"
-    monitor_progress_2: "在您的课程。"
-    monitor_progress_3: "为了添加一个学生，可以给他们发送一个您的部落的邀请链接，这个在"
-    monitor_progress_4: "页面。"
-    monitor_progress_5: "当他们加入之后，您可以在您的部落页面看到这些学生的进度汇总。"
-    private_clans_1: "私人部落为每个学生增加了隐私和详细的进度信息。"
-    private_clans_2: "为了添加一个私人部落，可以勾选'私人部落'选择框，在您建立一个"
-    private_clans_3: "。"
     who_for_title: "谁是CodeCombat的使用对象呢？"
-    who_for_1: "我们建议让9岁及以上的学生使用CodeCombat。无需任何编程经验。"
-    who_for_2: "我们设计CodeCombat来吸引男生女生。"
-    material_title: "这里有多少素材呢？"
-    material_premium_server: "约40小时的游戏时间和目前为止超过170个的订阅关卡。" # {change}
-    material_1: "大约25个小时的免费内容和额外的15个小时的订阅内容。"
-    concepts_title: "包括了哪些理论知识？"
-    how_much_title: "每月的订阅费用是多少?"
-    how_much_1: ""
-    how_much_2: "每月订阅"
-    how_much_3: "每月9.99美元，并可随时取消订阅。"
-    how_much_4: "另外，团体购买者将享受折扣优惠："
-    how_much_5: "我们接受一次性的打折购买以及每年订阅的团体，比如班级或者学校。请联系"
-    how_much_6: "来获取详情。"
+    who_for_1: "我们建议让9岁及以上的学生使用CodeCombat。无需任何编程经验。" # {change}
+    who_for_2: "我们设计CodeCombat来吸引男生女生。" # {change}
     more_info_title: "我可以在哪里找到更多信息？"
     more_info_1: "我们的"
     more_info_2: "教师论坛"
     more_info_3: "是个与其他使用CodeCombat的教育工作者联系的良好平台。"
-    sys_requirements_title: "系统需求"
-    sys_requirements_1: "一个现代的浏览器。需要更新的 Chrome, Firefox, Safari 或者 Internet Explorer 9 以上版本。"
-    sys_requirements_2: "CodeCombat 暂时还不支持 iPad 。"
 
   teachers_survey:
     title: "教师调查"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     screenshot_included: "包含截屏"
     where_reply: "我们应该回复谁？"
     send: "反馈意见"
-    contact_candidate: "联系参选人" # Deprecated
-    recruitment_reminder: "用这张表格来联系您希望面试的求职者。但请记住如果您雇佣了他，CodeCombat会收取这位员工第一年工资的15%作为佣金。佣金需在雇佣此员工时就付清并且在之后的90天内如果此员工离职会100%退款。兼职，远程办公员工，合同工以及实习生都可免除此费用。" # Deprecated
 
   account_settings:
     title: "账户设置"
@@ -743,7 +662,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     password_tab: "密码"
     emails_tab: "邮件"
     admin: "管理"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "点此管理您的订阅"
     new_password: "新密码"
     new_password_verify: "再次输入密码"
     type_in_email: "输入您的邮箱地址"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     saved: "更改已保存"
     password_mismatch: "密码不匹配。"
     password_repeat: "请重新键入密码。"
-    job_profile: "工作经历" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "您填写的工作经历将由CodeCombat认证。 雇主将看到这些信息，除非您将它设置为不启用状态或者连续四周没有更新。"
-    job_profile_explanation: "您好! 请填写下列信息, 我们将使用它帮您寻找一份软件开发的工作。"
-    sample_profile: "查看示例"
-    view_profile: "浏览个人信息"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "快捷键"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     subs_only: "只限订阅"
     create_clan: "创建新的部落"
     private_preview: "预览"
+#    private_clans: "Private Clans"
     public_clans: "公开部落"
     my_clans: "我的部落"
     clan_name: "部落名字"
@@ -855,7 +770,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     started_2: "已开始"
     not_started_2: "还没开始"
     view_solution: "点击查阅答案。"
-#    view_attempt: "Click to view attempt."
+    view_attempt: "点击查阅解题的尝试"
     latest_achievement: "最新成就"
     playtime: "游戏时间"
     last_played: "最后玩了"
@@ -877,7 +792,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
   courses:
     course: "课程"
     courses: "课程"
-#    create_new_class: "Create New Class"
+    create_new_class: "建立新的课堂"
     not_enrolled: "您还没有报名参加本课程。"
     visit_pref: "请到这个"
     visit_suf: "网页注册。"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     payments: "支付方式"
     prepaid_codes: "预付费码"
     purchased: "已购买"
-    sale: "促销"
     subscription: "订阅"
     invoices: "票据"
     service_apple: "设备：苹果"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     email_settings_url: "您的电子邮件设置"
     email_description_suffix: "或者我们发送的邮件中的链接，您可以随时更改您的偏好设置或者随时取消订阅。"
     cost_title: "花费"
-    cost_description: "目前来说，CodeCombat是完全免费的！我们的主要目标之一也是保持目前这种方式，让尽可能多的人玩得更好，不论是否是生活中。如果情况糟糕，我们可能会对某些内容采取订阅收费，但我们宁愿不那么做。运气好的话，我们可以维持公司，通过："
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "版权与许可"
     contributor_title: "贡献者许可协议"
     contributor_description_prefix: "所有对本网站或是GitHub代码库的贡献都依照我们的"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     nutshell_title: "简而言之"
     nutshell_description: "我们在关卡编辑器里公开的任何资源，您都可以在制作关卡时随意使用，但我们保留限制在CodeCombat.com 之上创建的关卡本身传播的权利，因为我们以后可能决定为它们收费。"
     canonical: "这篇说明的英文版本是权威版本。如果各个翻译版本之间有任何冲突，请以英文版为准。"
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "竞标赛奖项" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     license: "许可证"
     oreilly: "您选择的电子书"
 
-  account_profile:
-    settings: "设置" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "编辑资料"
-    done_editing: "完成编辑"
-    profile_for_prefix: "关于他的基本资料："
-    profile_for_suffix: ""
-    featured: "被推荐"
-    not_featured: "未入选"
-    looking_for: "寻找"
-    last_updated: "最后一次更新："
-    contact: "联系"
-    active: "正在寻求面试机会"
-    inactive: "目前没有在寻找新的工作机会"
-    complete: "完成"
-    next: "下一步"
-    next_city: "城市?"
-    next_country: "选择您所处的国家"
-    next_name: "名字?"
-    next_short_description: "简短描述您自己。"
-    next_long_description: "描述一下您希望找到何种工作。"
-    next_skills: "列出至少五个技能。"
-    next_work: "您的过往工作经验"
-    next_education: "教育经历"
-    next_projects: "展示您曾经参与过的至多3个项目。"
-    next_links: "添加任何个人网站或社交媒体链接。"
-    next_photo: "添加一张职业的照片（可选）。"
-    next_active: "将自己标记为正在寻求工作机会以使自己的名字出现在搜索结果中。"
-    example_blog: "您的博客"
-    example_personal_site: "个人主页"
-    links_header: "个人网站链接"
-    links_blurb: "链接任何您希望展示的网站或介绍，例如您的Github，您的LinkedIn，或是您的博客。"
-    links_name: "链接名称"
-    links_name_help: "您希望链接到什么？"
-    links_link_blurb: "链接的URL"
-    basics_header: "更新基本信息"
-    basics_active: "接受工作邀请"
-    basics_active_help: "希望现在就接到面试邀请？"
-    basics_job_title: "期望职位"
-    basics_job_title_help: "您希望在工作中扮演何种角色？"
-    basics_city: "城市"
-    basics_city_help: "您希望在哪座城市工作（或现在居住在哪座城市）。"
-    basics_country: "国家"
-    basics_country_help: "您希望在哪个国家工作（或现在居住在哪个国家）。"
-    basics_visa: "美国工作签证状态"
-    basics_visa_help: "您是否有权在美国合法地工作，或者您是否需要公司资助办理美国工作签证？"
-    basics_looking_for: "寻找"
-    basics_looking_for_full_time: "全职"
-    basics_looking_for_part_time: "兼职"
-    basics_looking_for_remote: "远程工作"
-    basics_looking_for_contracting: "合同制工作"
-    basics_looking_for_internship: "实习"
-    basics_looking_for_help: "您希望找到哪种开发者职位？"
-    name_header: "请填写您的姓名"
-    name_anonymous: "匿名开发者"
-    name_help: "您希望雇主看到的名字，例如‘Nick Winter'。"
-    short_description_header: "写一段简短的自我介绍"
-    short_description_blurb: "在此添加一段简介让雇主一眼就发现您是否是他们正在寻找的开发者。"
-    short_description: "简短介绍"
-    short_description_help: "您是谁，您在寻求什么？请勿超过140个字符。"
-    skills_header: "技能"
-    skills_help: "按照熟练程度列出您所掌握的与开发有关的技能。"
-    long_description_header: "详细描述您所期望的职位"
-    long_description_blurb: "告诉我们您的优点与您感兴趣的职位"
-    long_description: "描述"
-    long_description_help: "向潜在的雇主描述您自己。尽量简明扼要。我们建议您列出您最感兴趣的职位。请勿超过600个字符。"
-    work_experience: "工作经验"
-    work_header: "按时间顺序列出您的工作经历"
-    work_years: "工作年限"
-    work_years_help: "您有多少年职业的（有正常收入）软件开发经验？"
-    work_blurb: "列出相关的工作经验，从最近的开始。"
-    work_employer: "雇主"
-    work_employer_help: "您雇主的名字。"
-    work_role: "职称"
-    work_role_help: "您的职称是什么或者说您扮演何种角色？"
-    work_duration: "起止时间"
-    work_duration_help: "您在什么时间段在职？"
-    work_description: "描述"
-    work_description_help: "您在那里主要的工作是什么？（140个字符；选填）"
-    education: "教育程度"
-    education_header: "列出您的教育经历。"
-    education_blurb: "列出您在校学习的经历。"
-    education_school: "学校"
-    education_school_help: "您就读的学校的名字。"
-    education_degree: "学位"
-    education_degree_help: "您的学位以及您学习的方向是什么？"
-    education_duration: "时间"
-    education_duration_help: "什么时候？"
-    education_description: "描述"
-    education_description_help: "说说任何与您的教育经历相关的东西。（140个字符；选填）"
-    our_notes: "CodeCombat的评注"
-    remarks: "评价"
-    projects: "项目"
-    projects_header: "添加3个项目"
-    projects_header_2: "项目（前3个）"
-    projects_blurb: "展示您所参加的可以让雇主感到惊叹的项目。"
-    project_name: "项目名称"
-    project_name_help: "项目被称作什么？"
-    project_description: "描述"
-    project_description_help: "简短的介绍一下这个项目。"
-    project_picture: "图片"
-    project_picture_help: "上传一张230x115像素或更大的图片来展示这个项目。"
-    project_link: "链接"
-    project_link_help: "项目的链接。"
-    player_code: "玩家代码"
-
-  employers:
-    deprecation_warning_title: "抱歉，CodeCombat现不招聘雇员。"
-    deprecation_warning: "我们现在只专注在初学者等级的开发，暂时还不需要雇用天才级开发人员。"
-    hire_developers_not_credentials: "我们只招聘开发人员，不招聘证书。" # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "入门"
-    already_screened: "我们已经筛选过所有应征者了"
-    filter_further: "， 但是您也可以进一步筛选:"
-    filter_visa: "Visa"
-    filter_visa_yes: "US认证"
-    filter_visa_no: "未认证"
-    filter_education_top: "顶尖学校"
-    filter_education_other: "其他"
-    filter_role_web_developer: "网页开发者"
-    filter_role_software_developer: "软件开发者"
-    filter_role_mobile_developer: "移动开发者"
-    filter_experience: "经验"
-    filter_experience_senior: "上级"
-    filter_experience_junior: "初级"
-    filter_experience_recent_grad: "刚毕业"
-    filter_experience_student: "学院生"
-    filter_results: "成绩"
-    start_hiring: "开始招聘。"
-    reasons: "三个您该通过我们招聘的理由："
-    everyone_looking: "每一个来这里的人是为了找寻他们的下一个机会。"
-    everyone_looking_blurb: "忘了那20%的LinkedIn InMain回复率。每一个被我们列入这个站点的人希望找到他们的下一个位置以及将会回应您要求自我介绍的请求。"
-    weeding: "坐下吧！我们已经为您将不必要的都去除了。"
-    weeding_blurb: "每一位被我们列举的玩家都已经通过筛选，他们都有非凡的技能。我们也通过电话进行筛选以选择应征者及记下他们的资料来节省您的时间。"
-    pass_screen: "他们一定会通过您的技术能力测试的！"
-    pass_screen_blurb: "看过他们的代码后才做出决定。有个雇主发现比起直接从Hacker News招聘，更多应征者通过他的技术能力测试。"
-    make_hiring_easier: "请让我的招聘变得容易。"
-    what: "什么是CodeCombat？"
-    what_blurb: "CodeCombat是一个多人浏览器编程游戏。玩家编写代码控制他们的力量来跟其他开发人员战斗。我们的玩家有技术上的各个经验。"
-    cost: "我们的收费多少？"
-    cost_blurb: "我们只收取第一年薪资的15%并在前90天提供100%退款保障。我们不对那些已经参与贵公司面试的应征者收费。"
-    candidate_name: "姓名"
-    candidate_location: "地点"
-    candidate_looking_for: "寻找"
-    candidate_role: "角色"
-    candidate_top_skills: "高级技能"
-    candidate_years_experience: "多年工作经验"
-    candidate_last_updated: "最后一次更新"
-    candidate_who: "谁？"
-    featured_developers: "主要开发者"
-    other_developers: "其他开发者"
-    inactive_developers: "不活跃的开发者"
-
   admin:
     av_espionage: "Espionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "邮箱或用户名"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     av_entities_sub_title: "实体"
     av_entities_users_url: "用户"
     av_entities_active_instances_url: "活动实例"
-    av_entities_employer_list_url: "雇主列表"
-    av_entities_candidates_list_url: "应征者列表"
     av_entities_user_code_problems_list_url: "用户代码问题列表"
     av_other_sub_title: "其他"
     av_other_debug_base_url: "Base（用于调试 base.jade）"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index ed0d1562e..e44d7d277 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     multiplayer: "多人連線" # Not currently shown on home page
     for_developers: "開發者專區" # Not currently shown on home page.
     or_ipad: "或下載 iPad 版"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "返回地圖" # The top nav bar entry where players choose which levels to play
@@ -115,12 +112,11 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     creating: "帳號建立中..."
     sign_up: "註冊"
     log_in: "登入"
-    social_signup: "您也可以使用G+或Facebook帳號註冊:"
     required: "在這麼做之前必須先登入。"
     login_switch: "已經有申請帳號了嗎？"
-#    school_name: "School Name and City"
-#    optional: "optional"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name: "就讀學校及所在城市"
+    optional: "選填"
+    school_name_placeholder: "範例: XX中學, 台北"
 
   recover:
     recover_account_title: "復原帳號"
@@ -225,10 +221,10 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     years: "年"
 
   play_level:
-#    completed_level: "Completed Level:"
-#    course: "Course:"
+    completed_level: "完成關卡:"
+    course: "課程:"
     done: "完成"
-#    next_level: "Next Level:"
+    next_level: "下一個關卡:"
     next_game: "下一個遊戲"
     show_menu: "顯示遊戲菜單"
     home: "首頁" # Not used any more, will be removed soon.
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     incomplete: "未完成"
     timed_out: "時間用盡"
     failing: "失敗"
-    action_timeline: "行動時間軸"
-    click_to_select: "點擊選擇一個單元。"
     control_bar_multiplayer: "多人遊戲"
     control_bar_join_game: "加入遊戲"
     reload: "重新載入"
@@ -348,7 +342,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     tip_free_your_mind: "放下一切私心雜念，丟棄害怕、疑問和拒信，解放您的思維。 - 莫菲斯《駭客任務》"
     tip_strong_opponents: "即使是最强大的對手也有弱点的。 - 宇智波鼬《火影忍者》"
     tip_paper_and_pen: "在您開始編碼之前，您可以隨時用一張紙和一支筆作計劃。"
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_solve_then_write: "要先想清楚問題如何解決, 再進行編碼的動作. - John Johnson"
 
   game_menu:
     inventory_tab: "倉庫"
@@ -409,7 +403,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     comparison_blurb: "訂閱 CodeCombat 來磨練您的技巧!"
     feature1: "110 個以上的基本關卡散佈在4張地圖中"
     feature2: "10 個強壯的<strong>新英雄</strong>並每隻都有不同技巧!"
-    feature3: "70 個以上的額外關卡" # {change}
+    feature3: "80 個以上的額外關卡"
     feature4: "每個月<strong>3500顆額外寶石</strong>!"
     feature5: "視頻教學"
     feature6: "頂級信箱支援"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     parents_title: "親愛的家長: 您的孩子將要學習編程. 您會支持孩子發展嗎？"
     parents_blurb1: "您的孩子已經玩了 __nLevels__ 關，並且學習了編程基礎。請您為了培養他們的興趣而給他們訂閱，他們能繼續玩下去。"
     parents_blurb1a: "不要懷疑計算機編程能力將是您的孩子作為一個成年人的基本技能。到2020年，77%的工作將會需要編碼能力，並且軟件工程師將在世界各地成為高需求職業。您知道要計算機科學是收入最高的大學學位。"
-    parents_blurb2: "每月支付 $9.99 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助。"
+    parents_blurb2: "每月支付 ${{price}} 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助。"
     parents_blurb3: "沒有風險: 保證 100% 退費, 一步取消訂閱。"
     payment_methods: "付費方法"
     payment_methods_title: "可接受的付款方式"
     payment_methods_blurb1: "我們現有的付費方式有信用卡和支付寶" # {change}
     payment_methods_blurb2: "如果您想用其他付費方式,請聯繫我們"
-    sale_already_subscribed: "您已經訂閱！"
-    sale_blurb1: "和正常一年的訂閱價格 $120 相比" # {change}
-    sale_blurb2: "年費訂閱能節省 $21!"
     sale_button: "促銷！"
-    sale_button_title: "年費訂閱能節省 $21 的費用" # {change}
-    sale_click_here: "點擊這裡"
-    sale_ends: "結束"
-    sale_extended: "*已訂閱用戶會續期一年。"
-    sale_feature_here: "你將會獲得這些："
-    sale_feature2: "可以使用10 個強大的<strong>新英雄</strong> 和各種技能！"
-    sale_feature4: "立即取得<strong>42,000 個額外的寶石</strong>！"
-    sale_continue: "準備好繼續探險嗎？"
-    sale_limited_time: "限時優惠！"
-    sale_new_heroes: "新英雄！"
-    sale_title: "開學促銷"
-    sale_view_button: "購買年費訂閱："
+    sale_button_title: "年費訂閱能節省 ${{discount}} 的費用"
     stripe_description: "每月訂閱"
-    stripe_description_year_sale: "年費訂閱 ($21 優惠)" # {change}
+    stripe_description_year_sale: "年費訂閱 (${{discount}} 優惠)" # {change}
     subscription_required_to_play: "您將需要訂閱來開啟這關。"
     unlock_help_videos: "訂閱來解開所有鎖住得教學影片。"
     personal_sub: "個人訂閱" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     currently_free_until: "您目前有一個訂閱，直到"
     was_free_until: "您有過一個免費訂閱，直到"
     managed_subs: "管理訂閱"
-    managed_subs_desc: "為其他玩家（學生、兒童等）添加訂閱。"
-    managed_subs_desc_2: "收件人必須有一個與您提供的電子郵件地址相關聯的codecombat帳戶。."
-    group_discounts: "團購價"
-    group_discounts_1: "我們還為批量訂閱提供團購價"
-    group_discounts_1st: "1個訂閱"
-    group_discounts_full: "全價"
-    group_discounts_2nd: "2-11個訂閱"
-    group_discounts_20: "八折"
-    group_discounts_12th: "12＋個訂閱"
-    group_discounts_40: "六折"
     subscribing: "訂閱中・・・"
-    recipient_emails_placeholder: "請輸入電子郵件地址來訂閱，每行一個。"
-    subscribe_users: "訂閱用戶"
-    users_subscribed: "用戶訂閱："
-    no_users_subscribed: "沒有用戶訂閱，請仔細檢查您的電子郵件地址。"
     current_recipients: "當前收件人"
     unsubscribing: "取消訂閱中・・・" # {change}
     subscribe_prepaid: "點擊訂閱來使用預付代碼"
@@ -525,7 +491,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     health_2: "例表"
     health_3: "裝備血量。"
     speed_1: "移動速度"
-    speed_2: "米每秒。"
+    speed_2: "公尺每秒。"
     available_for_purchase: "可以購買" # Shows up when you have unlocked, but not purchased, a hero in the hero store
     level_to_unlock: "解鎖關卡:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "特定英雄才可遊玩此關卡。"
@@ -604,68 +570,23 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     jose_blurb: "放輕鬆"
     retrostyle_title: "插畫師"
     retrostyle_blurb: "復古風格的遊戲"
-#    rob_title: "Compiler Engineer"
-#    rob_blurb: "Codes things and stuff"
-#    josh_c_title: "Game Designer"
-#    josh_c_blurb: "Designs games"
-#    carlos_title: "Region Manager, Brazil"
+    rob_title: "編譯工程師"
+    rob_blurb: "編寫一些的代碼"
+    josh_c_title: "遊戲設計師"
+    josh_c_blurb: "設計遊戲"
+    carlos_title: "區經理 - 巴西"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
   teachers:
-    more_info: "致教師的說明"
-    intro_1: "CodeCombat 是一個教編程的網上游戲。學生會用編程語言寫代碼。"
-    intro_2: "無需經驗！"
-    free_title: "要多少錢？"
-    cost_premium_server: "CodeCombat的前5個關卡在中國是免費的，在這之後需花費每月9.99美元來訪問我們架設在中國專屬服務器上的190多個關卡。"
-    free_1: "有110多個覆蓋了所有理論的免費關卡。"
-    free_2: "包月訂閱可以訪問視頻教程和額外的練習關卡。"
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-    teacher_subs_title: "教師可免費訂閱！" # {change}
-    teacher_subs_0: "我們可為教師提供用於評估的免費訂閱。" # {change}
-    teacher_subs_1: "請聯繫"
-    teacher_subs_2: "教師調查"
-    teacher_subs_3: "建立您的訂閱。" # {change}
-    sub_includes_title: "訂閱裡包含了什麼內容？"
-    sub_includes_1: "除了110＋個基礎關卡，學生包月訂閱還可以使用這些附加功能："
-    sub_includes_2: "超過70個練習關卡" # {change}
-    sub_includes_3: "視頻教學"
-    sub_includes_4: "獨特的電子郵件支援"
-    sub_includes_5: "10个具有独特技能的新英雄"
-    sub_includes_6: "每月享有3500額外寶石"
-    sub_includes_7: "私人部落"
-    monitor_progress_title: "我要如何查看學生的進度？"
-    monitor_progress_1: "要查看學生的進度，可以通過建立一個"
-    monitor_progress_2: "在你的課程。"
-    monitor_progress_3: "添加一個學生，可以透過發送一個你的部落邀請鏈接給他們，這個在"
-    monitor_progress_4: "頁面。"
-    monitor_progress_5: "當他們加入之後，你可以在你的部落頁面看到這些學生的進度匯總。"
-    private_clans_1: "私人部落提升了每個學生的隱私和詳細的進度信息。"
-    private_clans_2: "為了添加一個私人部落，可以勾選“私人部落”選擇框，在你建立一個"
-    private_clans_3: "."
     who_for_title: "誰是CodeCombat的使用對象呢？"
-    who_for_1: "我們建議讓9歲及以上的學生使用CodeCombat。無需任何編程經驗。"
-    who_for_2: "我們設計CodeCombat來吸引男生女生。"
-    material_title: "這裡有多少素材呢？"
-    material_premium_server: "約40小時的遊戲時間和目前為止超過170個的訂閱關卡。" # {change}
-    material_1: "大約25個小時的免費內容和額外的15個小時的訂閱內容。"
-    concepts_title: "包括了哪些理論知識？"
-    how_much_title: "每月的訂閱費用是多少？"
-    how_much_1: ""
-    how_much_2: "每月訂閱"
-    how_much_3: "每月9.99美元，並可隨時取消訂閱。"
-    how_much_4: "另外，團體購買者將享受折扣優惠："
-    how_much_5: "我們接受一次性的打折購買以及每年訂閱的團體，比如班級或者學校。請聯繫"
-    how_much_6: "來獲取詳情。"
+    who_for_1: "我們建議讓9歲及以上的學生使用CodeCombat。無需任何編程經驗。" # {change}
+    who_for_2: "我們設計CodeCombat來吸引男生女生。" # {change}
     more_info_title: "我可以在哪裡找到更多信息？"
     more_info_1: "我們的"
     more_info_2: "教師論壇"
     more_info_3: "是個與其他使用CodeCombat的教育工作者聯繫的良好平台。"
-    sys_requirements_title: "系統要求"
-    sys_requirements_1: "一個現代的瀏覽器。 需要更新的Chrome，Firefox、Safari或者Internet Explorer 9 以上版本。" # {change}
-    sys_requirements_2: "CodeCombat 暫時還不支持 iPad。" # {change}
 
   teachers_survey:
     title: "教師調查"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     screenshot_included: "包含螢幕截圖."
     where_reply: "我們回覆到?"
     send: "意見反饋"
-    contact_candidate: "聯繫候選人員" # Deprecated
-    recruitment_reminder: "使用這張表格來聯繫您有興趣的求職者. 記得CodeCombat將收取員工第一年薪水的15%當作佣金. 佣金須在僱用時就必須付清並且之後的90天內如果員工離職則可退款. 兼職, 遠端工作, 契約員工和實習生都可免除費用." # Deprecated
 
   account_settings:
     title: "帳號設定"
@@ -737,17 +656,17 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     wrong_password: "密碼錯誤"
     upload_picture: "上傳圖片"
     delete_this_account: "永久性的刪除帳戶"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
+    reset_progress_tab: "重置所有進度"
+    reset_your_progress: "清除您的所有進度並重新開始"
     god_mode: "上帝模式"
     password_tab: "密碼"
     emails_tab: "郵件"
     admin: "管理員"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "點此管理您的訂閱"
     new_password: "新密碼"
     new_password_verify: "確認密碼"
     type_in_email: "輸入您的Email來確認刪除"
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
+    type_in_email_progress: "輸入您的Email, 確認您真的要刪除進度"
     type_in_password: "還有輸入您的密碼。"
     email_subscriptions: "訂閱"
     email_subscriptions_none: "無Email訂閱"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     saved: "修改已儲存"
     password_mismatch: "密碼不正確。"
     password_repeat: "請重複輸入您的密碼。"
-    job_profile: "工作經歷" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "您的工作經歷已被CodeCombat驗證. 僱主將可以隨意瀏覽直到您設定為不啟動狀態或者已經四周沒有改變"
-    job_profile_explanation: "Hi! 請填寫下列資訊, 我們將使用它幫您媒合一份開發工作."
-    sample_profile: "觀看範例基本資料"
-    view_profile: "瀏覽您的基本資料"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "鍵盤快捷鍵"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     subs_only: "只限訂閱"
     create_clan: "創建新的部落"
     private_preview: "預覽"
+#    private_clans: "Private Clans"
     public_clans: "公共部落"
     my_clans: "我的部落"
     clan_name: "部落名字"
@@ -855,29 +770,29 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     started_2: "已開始"
     not_started_2: "尚未開始"
     view_solution: "點擊查閱答案。"
-#    view_attempt: "Click to view attempt."
+    view_attempt: "點擊查閱解題的嘗試"
     latest_achievement: "最新成就"
     playtime: "遊戲時間"
     last_played: "最後玩了"
     leagues_explanation: "在部落裡與其他成員組成聯盟一起參加下面的多人競技場。"
 #    track_concepts1: "Track concepts"
-#    track_concepts2a: "learned by each student"
-#    track_concepts2b: "learned by each member"
-#    track_concepts3a: "Track levels completed for each student"
-#    track_concepts3b: "Track levels completed for each member"
-#    track_concepts4a: "See your students'"
-#    track_concepts4b: "See your members'"
-#    track_concepts5: "solutions"
-#    track_concepts6a: "Sort students by name or progress"
-#    track_concepts6b: "Sort members by name or progress"
-#    track_concepts7: "Requires invitation"
-#    track_concepts8: "to join"
+    track_concepts2a: "由每位學生學習"
+    track_concepts2b: "由每位成員學習"
+    track_concepts3a: "查看每位同學達到的等級"
+    track_concepts3b: "查看每位成員達到的等級"
+    track_concepts4a: "查看你的學生"
+    track_concepts4b: "查看你的成員"
+    track_concepts5: "解決方案"
+    track_concepts6a: "按姓名或進度排序學生"
+    track_concepts6b: "按姓名或進度排序成員"
+    track_concepts7: "需要邀請"
+    track_concepts8: "來加入"
 #    private_require_sub: "Private clans require a subscription to create or join."
 
   courses:
     course: "課程"
     courses: "課程"
-#    create_new_class: "Create New Class"
+    create_new_class: "建立新的課堂"
     not_enrolled: "您没有註冊這一節課。"
     visit_pref: "請到這個"
     visit_suf: "網頁註冊。"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     payments: "付款"
     prepaid_codes: "充值碼"
     purchased: "已購買"
-    sale: "促銷"
     subscription: "訂閱"
     invoices: "收據"
     service_apple: "設備: Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     email_settings_url: " 在您的郵件設定 "
     email_description_suffix: "或在我們送出的信件上都有留著我們的聯結, 您可以更改您的喜好並且輕易的隨時取消訂閱。"
     cost_title: "花費"
-    cost_description: "CodeCombat在核心的關卡是全部免費, 但只要花費一個月$9.99美金來訂閱, 您將在每個月取得額外的關卡和3500顆寶石。 您可以輕易地取消訂閱並且保證取得100%的退費。"
+    cost_description: "CodeCombat在核心的關卡是全部免費, 但只要花費一個月${{price}}美金來訂閱, 您將在每個月取得額外的關卡和{{gems}}顆寶石。 您可以輕易地取消訂閱並且保證取得100%的退費。"
     copyrights_title: "版權和許可"
     contributor_title: "貢獻者許可協議"
     contributor_description_prefix: "所有在本網站或是 GitHub 代碼庫上的貢獻都依照我們的"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     nutshell_title: "簡而言之"
     nutshell_description: "我们在關卡编辑器里公開的任何資源, 您都可以在製作關卡時隨意使用, 但我们保留在 codecombat.com 之上創建的關卡本身傳播的權利, 因为我们往後可能決定以它們收費."
     canonical: "我們宣告這篇說明的英文版本是權威版本。 如果各個翻譯版本之間有任何衝突, 以英文版為準。"
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:
     title: "錦標賽獎項" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     license: "許可證"
     oreilly: "您選擇的電子書"
 
-  account_profile:
-    settings: "設定" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-    edit_profile: "編輯基本資料"
-    done_editing: "完成編輯"
-    profile_for_prefix: "關於"
-    profile_for_suffix: "的基本資料"
-    featured: "被推薦"
-    not_featured: "未獲選"
-    looking_for: "尋找:"
-    last_updated: "最後更新:"
-    contact: "聯繫"
-    active: "目前尋找面試機會"
-    inactive: "目前沒有在尋找面試機會"
-    complete: "完成"
-    next: "下一步"
-    next_city: "城市?"
-    next_country: "選擇您所居住的國家."
-    next_name: "姓名?"
-    next_short_description: "簡短的敘述您自己."
-    next_long_description: "描述您所需要的位置."
-    next_skills: "列出至少五項技能."
-    next_work: "您的過往經歷."
-    next_education: "教育經歷."
-    next_projects: "至少展示三項您所參與的專案."
-    next_links: "增加任何個人或社群的聯結."
-    next_photo: "增加一張專業的照片(可選)."
-    next_active: "將自己標記正在尋求工作機會以使自己的名字出現在搜索中."
-    example_blog: "部落格"
-    example_personal_site: "個人網站"
-    links_header: "個人聯結"
-    links_blurb: "聯結任何您想凸顯的網站或介紹, 例如：聯結您的GitHub, 您的LinkedIn, 您的部落格."
-    links_name: "聯結名稱"
-    links_name_help: "您想聯結到?"
-    links_link_blurb: "聯結網址"
-    basics_header: "更新基本的資訊"
-    basics_active: "接受工作邀請"
-    basics_active_help: "目前想要獲得面試機會?"
-    basics_job_title: "期望職位"
-    basics_job_title_help: "您正在尋找怎樣的職位?"
-    basics_city: "城市"
-    basics_city_help: "您想工作的城市(或者現在居住地)."
-    basics_country: "國家"
-    basics_country_help: "您想工作的國家(或者現在居住地)."
-    basics_visa: "美國工作簽證狀態"
-    basics_visa_help: "您是否在美國可以合法工作, 或者您需要公司資助簽證? (如果您住在Canada或Australia, 標注可以合法工作.)"
-    basics_looking_for: "尋找"
-    basics_looking_for_full_time: "全職"
-    basics_looking_for_part_time: "兼職"
-    basics_looking_for_remote: "遠端工作"
-    basics_looking_for_contracting: "約娉工作"
-    basics_looking_for_internship: "實習"
-    basics_looking_for_help: "您想要哪種的開發者職位?"
-    name_header: "填寫您的姓名"
-    name_anonymous: "匿名開發者"
-    name_help: "您希望僱主看到的姓名, 例如: 'Nick Winter'."
-    short_description_header: "簡短的敘述您自己"
-    short_description_blurb: "增加一則簡短介紹來幫助僱主快速的認識您."
-    short_description: "簡短介紹"
-    short_description_help: "您是誰, 您正在尋找啥? 最多 140 字."
-    skills_header: "技能"
-    skills_help: "按照熟練程度列出您所擁有的相關開發技能."
-    long_description_header: "描述您所希望的位置"
-    long_description_blurb: "告訴僱主您有多棒和您所希望扮演的角色."
-    long_description: "自我描述"
-    long_description_help: "向潛在僱主描述您自己. 保持簡短並且直指核心. 我們建議您列出最有興趣的職位; 最多600字."
-    work_experience: "工作經歷"
-    work_header: "按時間順序列出經歷"
-    work_years: "工作時間(年)"
-    work_years_help: "您擁有多少年的專業開發軟體的經驗(被支薪)?"
-    work_blurb: "列出您的相關工作經驗, 最近的優先."
-    work_employer: "僱主"
-    work_employer_help: "您僱主的姓名."
-    work_role: "職稱"
-    work_role_help: "您的職稱或者角色是?"
-    work_duration: "起止時間"
-    work_duration_help: "您的在職時間是?"
-    work_description: "描述"
-    work_description_help: "您在那是在做啥? (140 字; 可選)"
-    education: "教育"
-    education_header: "列出您的教育經歷"
-    education_blurb: "列出您在學校的經歷."
-    education_school: "學校"
-    education_school_help: "學校名稱."
-    education_degree: "學位"
-    education_degree_help: "您的學位以及專業是?"
-    education_duration: "日期"
-    education_duration_help: "何時?"
-    education_description: "描述"
-    education_description_help: "凸顯任何有關這個教育經歷的地方. (140 字; 可選)"
-    our_notes: "CodeCombat的筆記"
-    remarks: "標記"
-    projects: "專案"
-    projects_header: "增加3個專案"
-    projects_header_2: "專案(前3個)"
-    projects_blurb: "展示您的專案以求驚豔僱主."
-    project_name: "專案名稱"
-    project_name_help: "那個專案被稱為什麼?"
-    project_description: "描述"
-    project_description_help: "簡短描述專案."
-    project_picture: "照片"
-    project_picture_help: "上傳一張230x115px或更大的照片以顯示那份專案."
-    project_link: "聯結"
-    project_link_help: "專案的聯結."
-    player_code: "玩家代碼"
-
-  employers:
-    deprecation_warning_title: "抱歉, CodeCombat現在並沒有在徵才."
-    deprecation_warning: "我們暫且主要專注在找到初級有潛力的開發者而非高級的開發者."
-    hire_developers_not_credentials: "僱用真正的開發者, 而非一張證書." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-    get_started: "開始"
-    already_screened: "我們已經技術上考核過我們所有的候選人"
-    filter_further: ", 但是您還是可以更加嚴苛的過濾:"
-    filter_visa: "簽證"
-    filter_visa_yes: "美國授權"
-    filter_visa_no: "不被授權"
-    filter_education_top: "頂尖學校"
-    filter_education_other: "其他"
-    filter_role_web_developer: "網頁開發者"
-    filter_role_software_developer: "軟體開發者"
-    filter_role_mobile_developer: "移動開發者"
-    filter_experience: "經驗"
-    filter_experience_senior: "初級的"
-    filter_experience_junior: "高級的"
-    filter_experience_recent_grad: "剛畢業"
-    filter_experience_student: "大學學生"
-    filter_results: "結果"
-    start_hiring: "開始徵才."
-    reasons: "三個您應該透過我們徵才的理由:"
-    everyone_looking: "在這的每個人都在尋找各自的下一個機會."
-    everyone_looking_blurb: "不要再理會LinkedIn的20%郵件回復率. 我們列在這網站上的每個人都想要找到各自的下一個位置並且都將回復您以求得機會."
-    weeding: "仔細聽好; 我們已經幫您做了過濾."
-    weeding_blurb: "每位我們列出來的玩家已經考核過技術能力. 我們也對候選人執行電話訪談並且在他們的基本資料上留下記錄，以求節省您的時間."
-    pass_screen: "他們將通過您的技術能力考核."
-    pass_screen_blurb: "在聯絡前先檢視每位候選人的程式碼. 一位僱主發現我們列出的候選人能通過考核的人數是借由Hacker News的5倍."
-    make_hiring_easier: "請促使我們的僱用流程簡單點."
-    what: "CodeCombat是啥?"
-    what_blurb: "CodeCombat是個跑在瀏覽器上的多人編程遊戲. 玩家通過編寫程式碼來控制在戰場上的角色來擊潰其它玩家的角色. 我們的玩家有著全部主要的技術經驗."
-    cost: "我們收取多少費用?"
-    cost_blurb: "我們將收取員工第一年薪水的15%當作佣金. 佣金須在僱用時就必須付清並且之後的90天內如果員工離職則可退款. 我們不對已經參與貴公司面試的候選人收費."
-    candidate_name: "姓名"
-    candidate_location: "地點"
-    candidate_looking_for: "尋找"
-    candidate_role: "角色"
-    candidate_top_skills: "高級技能"
-    candidate_years_experience: "多年工作經驗"
-    candidate_last_updated: "最後一次更新"
-    candidate_who: "誰"
-    featured_developers: "主要開發者"
-    other_developers: "其他開發者"
-    inactive_developers: "不活躍的開發者"
-
   admin:
     av_espionage: "Espionage" # Really not important to translate /admin controls.
     av_espionage_placeholder: "信箱或用戶名"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     av_entities_sub_title: "商業個體"
     av_entities_users_url: "使用者"
     av_entities_active_instances_url: "有效實例"
-    av_entities_employer_list_url: "員工列表"
-    av_entities_candidates_list_url: "候選人列表"
     av_entities_user_code_problems_list_url: "用戶代碼問題列表"
     av_other_sub_title: "其他"
     av_other_debug_base_url: "Base (用於測試 base.jade)"
diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee
index 5beeeb3dd..bc742ddcd 100644
--- a/app/locale/zh-WUU-HANS.coffee
+++ b/app/locale/zh-WUU-HANS.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
 #  nav:
 #    play: "Levels" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
 #    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
 #    send: "Send Feedback"
-#    contact_candidate: "Contact Candidate" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
 #  account_settings:
 #    title: "Account Settings"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
 #    password_repeat: "Please repeat your password."
-#    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    nutshell_title: "In a Nutshell"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-#  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
 #  admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    av_entities_sub_title: "Entities"
 #    av_entities_users_url: "Users"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
 #    av_other_sub_title: "Other"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee
index 2c087b3ce..67617c384 100644
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@@ -13,9 +13,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     multiplayer: "聚隊打遊戲" # Not currently shown on home page
     for_developers: "適合開發個人" # Not currently shown on home page.
 #    or_ipad: "Or download for iPad"
-#    hoc_class_code: "I Have a Class Code"
-#    hoc_enter: "Enter"
-#    hoc_title: "Hour of Code?"
 
   nav:
     play: "遊戲開來" # The top nav bar entry where players choose which levels to play
@@ -115,7 +112,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     creating: "徠搭做賬號……"
     sign_up: "註冊"
     log_in: "登進"
-    social_signup: "要勿，爾好用Facebook搭G+註冊："
 #    required: "You need to log in before you can go that way."
 #    login_switch: "Already have an account?"
 #    school_name: "School Name and City"
@@ -244,8 +240,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
-    action_timeline: "行動時間橛"
-    click_to_select: "點選一個單位。"
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
 #    reload: "Reload"
@@ -438,30 +432,16 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
+#    parents_blurb2: "For ${{price}} USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
 #    payment_methods: "Payment Methods"
 #    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal 29.97 USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or $99 for a year."
+#    payment_methods_blurb1: "We currently accept credit cards and Alipay. You can also PayPal {{three_month_price}} USD to nick@codecombat.com with your account email in the memo to purchase three months' subscription and gems, or ${{year_price}} for a year."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-#    sale_already_subscribed: "You're already subscribed!"
-#    sale_blurb1: "Save $21"
-#    sale_blurb2: "off regular subscription price of $120 for a whole year!"
 #    sale_button: "Sale!"
 #    sale_button_title: "Save $21 when you purchase a 1 year subscription"
-#    sale_click_here: "Click Here"
-#    sale_ends: "Ends"
-#    sale_extended: "*Existing subscriptions will be extended by 1 year."
-#    sale_feature_here: "Here's what you'll get:"
-#    sale_feature2: "Access to 9 powerful <strong>new heroes</strong> with unique skills!"
-#    sale_feature4: "<strong>42,000 bonus gems</strong> awarded immediately!"
-#    sale_continue: "Ready to continue adventuring?"
-#    sale_limited_time: "Limited time offer!"
-#    sale_new_heroes: "New heroes!"
-#    sale_title: "Back to School Sale"
-#    sale_view_button: "Buy 1 year subscription for"
 #    stripe_description: "Monthly Subscription"
-#    stripe_description_year_sale: "1 Year Subscription ($21 discount)"
+#    stripe_description_year_sale: "1 Year Subscription (${{discount}} discount)"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
@@ -472,21 +452,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    currently_free_until: "You currently have a subscription until"
 #    was_free_until: "You had a free subscription until"
 #    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
 #    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
 #    unsubscribing: "Unsubscribing"
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
@@ -610,62 +576,17 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    josh_c_blurb: "Designs games"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
+#    maka_title: "Customer Advocate"
+#    maka_blurb: "Storyteller"
 
 #  teachers:
-#    more_info: "More Info for Teachers"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers."
-#    free_1: "There are 110+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    free_3: "The CodeCombat content is divided into"
-#    free_4: "courses"
-#    free_5: ".  The first course is free, and about an hour of material."
-#    free_6: "Access to the additional courses can be unlocked with a one-time purchase."
-#    teacher_subs_title: "Teachers get a free trial!"
-#    teacher_subs_0: "We offer free trials to teachers."
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to try out the paid courses."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 110+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "80+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
 #    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_premium_server: "Approximately 50 hours of gameplay spread over 190+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
+#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed. We've designed CodeCombat to appeal to both boys and girls."
+#    who_for_2: "Our Courses system allows teachers to set up classrooms, track progress and assign additional content to students through a dedicated interface."
 #    more_info_title: "Where can I find more information?"
 #    more_info_1: "Our"
 #    more_info_2: "teachers forum"
 #    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-#    sys_requirements_title: "System Requirements"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
 
 #  teachers_survey:
 #    title: "Teacher Survey"
@@ -723,8 +644,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    screenshot_included: "Screenshot included."
 #    where_reply: "Where should we reply?"
     send: "提出意見"
-    contact_candidate: "搭參選人聯繫" # Deprecated
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
 
   account_settings:
     title: "賬號設定"
@@ -769,11 +688,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     saved: "保存起來哉"
     password_mismatch: "密碼弗合。"
 #    password_repeat: "Please repeat your password."
-    job_profile: "工作經歷" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "爾填個工作經歷會讓CodeCombat來確認. 僱主會望着箇許訊息，除非爾畀渠調成望弗着狀態要勿粘牢四個星期朆改動。"
-    job_profile_explanation: "爾好！填箇許訊息，我裏會用渠幫爾尋一份軟件開發個工作。"
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
 
 #  keyboard_shortcuts:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
@@ -824,6 +738,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    subs_only: "subscribers only"
 #    create_clan: "Create New Clan"
 #    private_preview: "Preview"
+#    private_clans: "Private Clans"
 #    public_clans: "Public Clans"
 #    my_clans: "My Clans"
 #    clan_name: "Clan Name"
@@ -1079,10 +994,13 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content for FREE for 2 months."
+#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
+#    additional_resources_4_pref: "Check out our"
+#    additional_resources_4_mid: "Schools Page"
+#    additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings."
 #    your_classes: "Your Classes"
 #    no_classes: "No classes yet!"
 #    create_new_class1: "create new class"
@@ -1376,7 +1294,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    payments: "Payments"
 #    prepaid_codes: "Prepaid Codes"
 #    purchased: "Purchased"
-#    sale: "Sale"
 #    subscription: "Subscription"
 #    invoices: "Invoices"
 #    service_apple: "Apple"
@@ -1566,7 +1483,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     email_settings_url: "設定爾個電子郵箱"
     email_description_suffix: "要勿我裏發畀爾個信裏向有鏈接，爾随低2都好改偏向設定要勿取消訂閱。"
     cost_title: "花銷"
-    cost_description: "目前來講，CodeCombat 是全個免費個！我裏個大目標之一也是保持目前箇種方式，讓越多越好個人攪功還好，弗管是弗是生活裏向。空把天黯落來，我裏嘸數會畀訂一許內容收費，不過我裏能可弗馨妝。運道好個話，我裏好開公司，通過："
+#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "版權搭許可"
     contributor_title: "貢獻者許可協議"
     contributor_description_prefix: "所有對本網站要勿 GitHub 代碼庫個努力都照我裏個"
@@ -1601,6 +1518,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     nutshell_title: "省講佩是"
     nutshell_description: "我裏徠關編寫器裏公開個所有資源，做關到都候爾用，不過我裏保留限制 codecombat.com 上向所造各關傳播個權利，因爲我裏轉日嘸數畀箇許關數收鈔票。"
     canonical: "箇篇講明個英文版是權威版本。空是各許翻譯版本對弗牢，照英文版裏講個算數。"
+#    third_party_title: "Third Party Services"
+#    third_party_description: "CodeCombat uses the following third party services (among others):"
 
 #  ladder_prizes:
 #    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
@@ -1622,157 +1541,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-  account_profile:
-#    settings: "Settings" # We are not actively recruiting right now, so there's no need to add new translations for this section.
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
-    profile_for_prefix: "有關渠個基本訊息："
-    profile_for_suffix: ""
-#    featured: "Featured"
-#    not_featured: "Not Featured"
-    looking_for: "尋"
-    last_updated: "塌爛遍改動："
-    contact: "聯繫"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
-#    next_work: "chronicle your work history."
-#    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
-#    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
-#    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-#    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
-#    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
-#    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-    work_experience: "工作經驗"
-#    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
-#    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-#    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
-#    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
-#    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
-    education: "教育程度"
-#    education_header: "Recount your academic ordeals"
-#    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
-#    remarks: "Remarks"
-    projects: "項目"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
-#    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
-
-  employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-#    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-#    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
-#    already_screened: "We've already technically screened all our candidates"
-#    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
-#    filter_education_top: "Top School"
-#    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
-#    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-#    pass_screen: "They will pass your technical screen."
-#    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-    candidate_name: "名字"
-    candidate_location: "地址"
-    candidate_looking_for: "尋"
-    candidate_role: "角色"
-    candidate_top_skills: "高級技能"
-    candidate_years_experience: "多年工作經驗"
-    candidate_last_updated: "塌爛遍改動"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
-
   admin:
 #    av_espionage: "Espionage" # Really not important to translate /admin controls.
 #    av_espionage_placeholder: "Email or username"
@@ -1783,8 +1551,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     av_entities_sub_title: "實體"
     av_entities_users_url: "用戶"
     av_entities_active_instances_url: "活動樣品"
-#    av_entities_employer_list_url: "Employer List"
-#    av_entities_candidates_list_url: "Candidate List"
 #    av_entities_user_code_problems_list_url: "User Code Problems List"
     av_other_sub_title: "別樣"
     av_other_debug_base_url: "Base（用來調試 base.jade）"
diff --git a/app/models/Level.coffee b/app/models/Level.coffee
index 5afdcbb36..df0a1efbf 100644
--- a/app/models/Level.coffee
+++ b/app/models/Level.coffee
@@ -104,31 +104,28 @@ module.exports = class Level extends CocoModel
       if isHero and placeholderComponent = placeholders[defaultThangComponent.original]
         placeholdersUsed[placeholderComponent.original] = true
         placeholderConfig = placeholderComponent.config ? {}
+        levelThangComponent.config ?= {}
+        config = levelThangComponent.config
         if placeholderConfig.pos  # Pull in Physical pos x and y
-          levelThangComponent.config ?= {}
-          levelThangComponent.config.pos ?= {}
-          levelThangComponent.config.pos.x = placeholderConfig.pos.x
-          levelThangComponent.config.pos.y = placeholderConfig.pos.y
-          levelThangComponent.config.rotation = placeholderConfig.rotation
+          config.pos ?= {}
+          config.pos.x = placeholderConfig.pos.x
+          config.pos.y = placeholderConfig.pos.y
+          config.rotation = placeholderConfig.rotation
         else if placeholderConfig.team  # Pull in Allied team
-          levelThangComponent.config ?= {}
-          levelThangComponent.config.team = placeholderConfig.team
+          config.team = placeholderConfig.team
         else if placeholderConfig.significantProperty  # For levels where we cheat on what counts as an enemy
-          levelThangComponent.config ?= {}
-          levelThangComponent.config.significantProperty = placeholderConfig.significantProperty
+          config.significantProperty = placeholderConfig.significantProperty
         else if placeholderConfig.programmableMethods
           # Take the ThangType default Programmable and merge level-specific Component config into it
           copy = $.extend true, {}, placeholderConfig
-          programmableProperties = levelThangComponent.config?.programmableProperties ? []
+          programmableProperties = config?.programmableProperties ? []
           copy.programmableProperties = _.union programmableProperties, copy.programmableProperties ? []
-          levelThangComponent.config = _.merge copy, levelThangComponent.config
+          levelThangComponent.config = config = _.merge copy, config
         else if placeholderConfig.extraHUDProperties
-          levelThangComponent.config ?= {}
-          levelThangComponent.config.extraHUDProperties = _.union(levelThangComponent.config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
+          config.extraHUDProperties = _.union(config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
         else if placeholderConfig.voiceRange  # Pull in voiceRange
-          levelThangComponent.config ?= {}
-          levelThangComponent.config.voiceRange = placeholderConfig.voiceRange
-          levelThangComponent.config.cooldown = placeholderConfig.cooldown
+          config.voiceRange = placeholderConfig.voiceRange
+          config.cooldown = placeholderConfig.cooldown
 
     if isHero
       if equips = _.find levelThang.components, {original: LevelComponent.EquipsID}
diff --git a/app/models/Mandate.coffee b/app/models/Mandate.coffee
new file mode 100644
index 000000000..f779689b7
--- /dev/null
+++ b/app/models/Mandate.coffee
@@ -0,0 +1,6 @@
+CocoModel = require './CocoModel'
+
+module.exports = class MandateModel extends CocoModel
+  @className: 'Mandate'
+  @schema: require 'schemas/models/mandate.schema'
+  urlRoot: '/db/mandates'
diff --git a/app/models/Product.coffee b/app/models/Product.coffee
new file mode 100644
index 000000000..62a8c8434
--- /dev/null
+++ b/app/models/Product.coffee
@@ -0,0 +1,6 @@
+CocoModel = require './CocoModel'
+
+module.exports = class ProductModel extends CocoModel
+  @className: 'Product'
+  @schema: require 'schemas/models/product.schema'
+  urlRoot: '/db/products'
diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee
index 7891b8ae5..3aae60261 100644
--- a/app/models/ThangType.coffee
+++ b/app/models/ThangType.coffee
@@ -473,7 +473,7 @@ module.exports = class ThangType extends CocoModel
     name: name, display: display, matchedShortName: matchedShortName
 
   isSilhouettedItem: ->
-    return console.error "Trying to determine whether #{@get('name')} should be a silhouetted item, but it has no gem cost." unless @get('gems') or @get('tier')
+    return console.error "Trying to determine whether #{@get('name')} should be a silhouetted item, but it has no gem cost." unless @get('gems')? or @get('tier')?
     console.info "Add (or make sure you have fetched) a tier for #{@get('name')} to more accurately determine whether it is silhouetted." unless @get('tier')?
     tier = @get 'tier'
     if tier?
diff --git a/app/models/UserRemark.coffee b/app/models/UserRemark.coffee
deleted file mode 100644
index 73db3ecf3..000000000
--- a/app/models/UserRemark.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-CocoModel = require './CocoModel'
-
-module.exports = class UserRemark extends CocoModel
-  @className: 'UserRemark'
-  @schema: require 'schemas/models/user_remark'
-  urlRoot: '/db/user.remark'
diff --git a/app/schemas/models/mandate.schema.coffee b/app/schemas/models/mandate.schema.coffee
new file mode 100644
index 000000000..decb979b8
--- /dev/null
+++ b/app/schemas/models/mandate.schema.coffee
@@ -0,0 +1,18 @@
+c = require './../schemas'
+
+module.exports = MandateSchema = {
+  type: 'object'
+  additionalProperties: false
+  default:
+    simulationThroughputRatio: 1
+  properties: {
+    simulationThroughputRatio:
+      name: 'Simulation Throughput Ratio'
+      description: '0-1 fraction of requests for a match to simulate that should be granted.'
+      type: 'number'
+      minimum: 0
+      maximum: 1
+  }
+}
+
+c.extendBasicProperties MandateSchema, 'Mandate'
diff --git a/app/schemas/models/product.schema.coffee b/app/schemas/models/product.schema.coffee
new file mode 100644
index 000000000..b3cdc55b5
--- /dev/null
+++ b/app/schemas/models/product.schema.coffee
@@ -0,0 +1,13 @@
+c = require './../schemas'
+
+module.exports = ProductSchema = {
+  type: 'object'
+  additionalProperties: false
+  properties: {
+    name: { type: 'string' }
+    amount: { type: 'integer', description: 'Cost in cents' }
+    gems: { type: 'integer', description: 'Number of gems awarded' }
+  }
+}
+
+c.extendBasicProperties ProductSchema, 'Product'
diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee
index 1398ef0f6..80a822413 100644
--- a/app/schemas/models/user.coffee
+++ b/app/schemas/models/user.coffee
@@ -53,7 +53,7 @@ _.extend UserSchema.properties,
   iosIdentifierForVendor: c.shortString({format: 'hidden'})
   firstName: c.shortString({title: 'First Name'})
   lastName: c.shortString({title: 'Last Name'})
-  gender: {type: 'string', 'enum': ['male', 'female', 'secret', 'trans']}
+  gender: {type: 'string'} # , 'enum': ['male', 'female', 'secret', 'trans', 'other']
   ageRange: {type: 'string'}  # 'enum': ['0-13', '14-17', '18-24', '25-34', '35-44', '45-100']
   password: {type: 'string', maxLength: 256, minLength: 2, title: 'Password'}
   passwordReset: {type: 'string'}
@@ -117,7 +117,7 @@ _.extend UserSchema.properties,
     colorConfig: c.object {additionalProperties: c.colorConfig()}
 
   aceConfig: c.object { default: { language: 'python', keyBindings: 'default', invisibles: false, indentGuides: false, behaviors: false, liveCompletion: true }},
-    language: {type: 'string', 'enum': ['python', 'javascript', 'coffeescript', 'clojure', 'lua', 'io']}
+    language: {type: 'string', 'enum': ['python', 'javascript', 'coffeescript', 'clojure', 'lua', 'java', 'io']}
     keyBindings: {type: 'string', 'enum': ['default', 'vim', 'emacs']}
     invisibles: {type: 'boolean' }
     indentGuides: {type: 'boolean' }
@@ -127,6 +127,7 @@ _.extend UserSchema.properties,
   simulatedBy: {type: 'integer', minimum: 0 }
   simulatedFor: {type: 'integer', minimum: 0 }
 
+  # Deprecated. TODO: Figure out how to remove.
   jobProfile: c.object {title: 'Job Profile', default: { active: false, lookingFor: 'Full-time', jobTitle: 'Software Developer', city: 'Defaultsville, CA', country: 'USA', skills: ['javascript'], shortDescription: 'Programmer seeking to build great software.', longDescription: '* I write great code.\n* You need great code?\n* Great!' }},
     lookingFor: {title: 'Looking For', type: 'string', enum: ['Full-time', 'Part-time', 'Remote', 'Contracting', 'Internship'], description: 'What kind of developer position do you want?'}
     jobTitle: {type: 'string', maxLength: 50, title: 'Desired Job Title', description: 'What role are you looking for? Ex.: "Full Stack Engineer", "Front-End Developer", "iOS Developer"' }
diff --git a/app/schemas/models/user_remark.coffee b/app/schemas/models/user_remark.coffee
index 260164a3b..133f801db 100644
--- a/app/schemas/models/user_remark.coffee
+++ b/app/schemas/models/user_remark.coffee
@@ -1,5 +1,7 @@
 c = require './../schemas'
 
+# Deprecated. TODO: Remove
+
 UserRemarkSchema = c.object {
   title: 'Remark'
   description: 'Remarks on a user, point of contact, tasks.'
diff --git a/app/styles/account/subscription-sale-view.sass b/app/styles/account/subscription-sale-view.sass
deleted file mode 100644
index 6d9c39d5c..000000000
--- a/app/styles/account/subscription-sale-view.sass
+++ /dev/null
@@ -1,30 +0,0 @@
-#subscription-sale-view
-  .above-blurb
-    margin: 0 16% 0 16%
-  .center
-    text-align: center
-  .feature-description
-    font-size: 16px
-  .sale-blurb
-    font-size: 22px
-  .sale-ends
-    position: relative
-    left: 0px
-    top: 50px
-    font-size: 18px
-    line-height: 18px
-    background-color: red
-    color: white
-    margin: 0 7px
-    border-radius: 3px
-    padding: 6px
-    width: 200px
-    text-align: center
-    -ms-transform: rotate(330deg) /* IE 9 */
-    -moz-transform: rotate(330deg) /* Firefox */
-    -webkit-transform: rotate(330deg) /* Safari and Chrome */
-    -o-transform: rotate(330deg) /* Opera */
-  .sub-extended
-    font-size: 12px
-  #pay-button
-    font-size: 18px
diff --git a/app/styles/achievements.sass b/app/styles/achievements.sass
index bc9ee78e2..f3db0cbab 100644
--- a/app/styles/achievements.sass
+++ b/app/styles/achievements.sass
@@ -218,7 +218,7 @@ $user-achievements-scale: 0.8
   cursor: pointer
 
 .popup
-  left: 600px
+  left: -600px
 
 .user-level
   background-image: url("/images/achievements/level-bg.png")
diff --git a/app/styles/courses/teacher-courses-view.sass b/app/styles/courses/teacher-courses-view.sass
index c36c44d08..db6517ef1 100644
--- a/app/styles/courses/teacher-courses-view.sass
+++ b/app/styles/courses/teacher-courses-view.sass
@@ -1,9 +1,13 @@
 #teacher-courses-view
   margin-bottom: 50px
 
+  #activate-licenses-btn
+    margin-left: 10px
+
   .active-courses
     font-size: 12px
     font-weight: bold
+    margin: 18px 0px 4px 0px
     text-transform: uppercase
 
   .class-count
@@ -24,13 +28,21 @@
     padding: 6px
     background-color: #AAEA6E
 
+  .active-course-container
+    tr
+      margin-top: 30px
+    td
+      vertical-align: baseline
+
   .course-enrolled
     font-size: 12px
     font-weight: bold
+    margin-left: 40px
 
   .course-name
     font-size: 18px
     font-weight: bold
+    line-height: 30px
 
   .divider
     border-bottom: 1px solid black
diff --git a/app/styles/editor/thangTasksView.sass b/app/styles/editor/thangTasksView.sass
new file mode 100644
index 000000000..599a6a6ab
--- /dev/null
+++ b/app/styles/editor/thangTasksView.sass
@@ -0,0 +1,12 @@
+#thang-tasks-view
+  #thangTable
+    width: 100%
+
+  .tasksTable
+    width: 100%
+
+  .tasks
+    width: 87.5%
+    
+  .taskOwner
+    width: 12.5%
\ No newline at end of file
diff --git a/app/styles/employers.sass b/app/styles/employers.sass
deleted file mode 100644
index bf7e84a63..000000000
--- a/app/styles/employers.sass
+++ /dev/null
@@ -1,263 +0,0 @@
-#employers-view
-  .deprecation-warning
-    text-align: center
-    margin-bottom: 50px
-
-  .deprecated
-    cursor: default
-    opacity: 0.25
-
-  .artisanal-claim
-    background: transparent url(/images/pages/employer/artisanal_claim.png) no-repeat center
-    margin-bottom: 5px
-    height: 24px
-
-  .employer-button
-    background: #fce232 /* Old browsers */
-    background: -moz-linear-gradient(top, #fce232 0%, #ea8e2b 100%) 
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fce232), color-stop(100%,#ea8e2b))
-    background: -webkit-linear-gradient(top, #fce232 0%,#ea8e2b 100%) 
-    background: -o-linear-gradient(top, #fce232 0%,#ea8e2b 100%) 
-    background: -ms-linear-gradient(top, #fce232 0%,#ea8e2b 100%) 
-    background: linear-gradient(to bottom, #fce232 0%,#ea8e2b 100%)
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fce232', endColorstr='#ea8e2b',GradientType=0 )
-    vertical-align: text-bottom
-    margin-left: 30px
-
-  #filter-column
-    margin-left: 0px
-    padding-right: 0
-
-  #candidates-column
-    padding-left: 5px
-    padding-right: 5px
-
-  //filter panels
-  #filter
-    border: 2px solid #CBCBCB
-    margin-bottom: 10px
-    .panel-heading
-      background-color: #D9D9D9
-      cursor: pointer
-      border-top-left-radius: 0px
-      border-top-right-radius: 0px
-      #folder-icon
-        margin-right: 5px
-        color: #919191
-    .panel-body
-      background-color: #D9D9D9
-      border-top-left-radius: 0px
-      border-top-right-radius: 0px
-      padding: 5px 10px 10px 10px
-    .panel
-      border: 1px red
-      border-radius: 0px
-     
-  #filters
-    margin-bottom: 10px
-    .filter_section
-      min-width: 25%
-      margin-right: 10px
-      display: inline-block
-      vertical-align: top
-
-    h4
-      margin-bottom: 5px
-
-    label
-      display: block
-      font-weight: normal
-      margin-bottom: 0
-      cursor: pointer
-      input
-        margin-right: 5px
-  #saved-filter-table
-    display: none
-    width: 100%
-    tbody 
-      tr:nth-child(even) 
-        background-color: #CBCBCB 
-    margin-bottom: 20px
-    .deletion-row
-      text-align: center
-  .get-started-button
-    vertical-align: text-bottom
-    margin-left: 10px
-  
-  #filter-button, #create-alert-button
-    float: right
-    
-  #login-link, #logout-link
-    position: absolute
-    right: 10px
-    top: -25px
-    color: black
-    display: inline-block
-    :visited
-      color: black
-  #logout-link:hover
-    cursor: pointer
-      
-  #tagline, .hiring-call-to-action
-    width: 100%
-    text-align: center
-    display: inline-block
-    margin-top: 20px
-    h1, h2, h3 
-      display: inline-block
-    button
-      display: inline-block
-  h1, h2, h3, h4
-    font-family: Arial, Helvetica, sans-serif
-    color: #333333
-  #tagline
-    margin-bottom: 20px
-
-  .see-candidates-header
-    margin: 30px
-    text-align: center
-
-    #see-candidates
-      cursor: pointer
-
-  .reasons
-    height: 275px
-    margin-bottom: 25px
-    width: 100%    
-
-    .information_row
-      height: 150px
-      padding-right: 15px
-    
-    .reason
-      width: 33%
-      padding-left: 3%
-      height: 150px
-      display: inline-block
-      vertical-align: top
-    .employer_icon
-      display: block
-      width: 125px
-      margin: 0px auto
-      
-    .reason_long
-      width: 50%
-      padding-left: 3%
-      display: inline-block
-      .employer_icon
-        display: inline-block
-        width: 25%
-        max-width: 125px
-        vertical-align: text-bottom
-      .reason_text
-        display: inline-block
-        width: 75%
-  #bottom_row
-    height: auto
-  #candidate-table
-    background-color: #E7E7E7
-    table
-      cursor: pointer
-      width: 96%
-      margin-left: 2%
-      margin-right: 2%
-      margin-bottom: 30px
-      .tag_column, .location_column, .education_column, .work_column
-        width: 33%
-        display: inline-block
-        img
-          margin-right: 5px
-          vertical-align: top
-      tr 
-        .candidate-picture
-          background-color: transparent
-          background-size: cover
-          background-repeat: no-repeat
-          background-position: center
-          width: 75px
-          height: 75px
-          border-radius: 5px
-          overflow: hidden
-          margin-right: 10px
-          &.anonymous
-            background-size: contain
-          
-        .candidate-description
-          width: 100%
-          vertical-align: bottom
-          div
-            text-overflow: ellipsis
-            overflow: hidden
-            height: 17px
-
-      td.candidate-description
-        padding-bottom: 5px
-      td.candidate-name-cell
-        padding-top: 15px
-        padding-bottom: 5px
-        font-size: 18px
-
-      .border_row
-        border-bottom: 1px solid #d3d3d3
-        vertical-align: bottom
-        td
-          padding-top: 5px
-          padding-bottom: 15px
-
-  .teaser-profiles #candidate-table table
-    .tag_column, .location_column, .education_column, .work_column
-      width: 25%
-    tr
-      .candidate-description
-        padding-top: 15px
-      .candidate-picture
-        width: 50px
-        height: 50px
-      
-  #results
-    display: inline-block
-  .tablesorter
-    //img
-    //  display: none
-
-    .tablesorter-header
-      cursor: pointer
-      &:hover
-        color: black
-
-      &:first-child
-        // Make sure that "Developer #56" doesn't wrap onto second row
-        min-width: 110px
-
-    .tablesorter-headerAsc
-      background-color: #cfc
-
-    .tablesorter-headerDesc
-      background-color: #ccf
-
-    tr
-      cursor: pointer
-
-    tr.expired
-      opacity: 0.5
-
-    code
-      background-color: rgb(220, 220, 220)
-      color: #555
-      margin: 2px 0
-      display: inline-block
-      text-transform: lowercase
-
-    td:nth-child(3) select
-      min-width: 100px
-    td:nth-child(6) select
-      min-width: 50px
-    td:nth-child(7) select
-      min-width: 100px
-
-#employers-view, #profile-view.viewed-by-employer
-  #outer-content-wrapper, #intermediate-content-wrapper, #inner-content-wrapper
-    background: #B4B4B4
-
-  .main-content-area
-    background-color: #EAEAEA
diff --git a/app/styles/home.sass b/app/styles/home.sass
index 32d67e486..03f647511 100644
--- a/app/styles/home.sass
+++ b/app/styles/home.sass
@@ -3,29 +3,6 @@
 
 #home-view
 
-  #hour-of-code
-    top: 632px
-    height: 190px
-    width: 400px
-    padding: 15px
-    border: 0
-    background: transparent url(/images/pages/play/level-info-background.png) no-repeat center center
-    background-size: 100% 100%
-
-    @media screen and ( max-height: 800px )
-      top: 382px
-    h1
-      color: rgb(255,253,149)
-      text-shadow: 0 0 6px black,0 0 6px black,0 0 6px black,0 0 6px black, 0 0 6px black,0 0 6px black,0 0 6px black,0 0 6px black, 0 0 6px black,0 0 6px black,0 0 6px black,0 0 6px black, 0 0 6px black,0 0 6px black,0 0 6px black,0 0 6px black, 0 0 6px black,0 0 6px black,0 0 6px black,0 0 6px black
-    .btn-class-code
-      float: left
-      margin-left: 10px
-      margin-top: 10px
-    .btn-enter
-      float: right
-      margin-right: 10px
-      margin-top: 10px
-
   #kids-coding-container
     $coding-image-size: 272px
     position: relative
@@ -53,7 +30,7 @@
     @media screen and ( max-height: 800px )
       height: 510px
 
-  #play-button, #or-ipad, #apple-store-button, #slogan, .alert, #news, #hour-of-code, #alternate-play-button
+  #play-button, #or-ipad, #apple-store-button, #slogan, .alert, #news, #alternate-play-button
     text-align: center
     text-transform: uppercase
     font-weight: bold
diff --git a/app/styles/play/modal/play-heroes-modal.sass b/app/styles/play/modal/play-heroes-modal.sass
index 5aed4d59a..45911e24c 100644
--- a/app/styles/play/modal/play-heroes-modal.sass
+++ b/app/styles/play/modal/play-heroes-modal.sass
@@ -396,6 +396,8 @@ $heroCanvasHeight: 275px
             background-image: url(/images/common/code_languages/clojure_small.png)
           &[data-value="lua"]
             background-image: url(/images/common/code_languages/lua_small.png)
+          &[data-value="java"]
+            background-image: url(/images/common/code_languages/java_small.png)
           &[data-value="io"]
             background-image: url(/images/common/code_languages/io_small.png)
 
diff --git a/app/styles/sales-view.sass b/app/styles/sales-view.sass
new file mode 100644
index 000000000..decdfbe3d
--- /dev/null
+++ b/app/styles/sales-view.sass
@@ -0,0 +1,197 @@
+#sales-view
+
+  background-color: #F5F5F5
+  font-family: Helvetica, sans-serif
+  font-size: 15px
+  line-height: 20px
+
+  // TODO: better way to remove content styling?
+  #site-content-area
+    width: 100%
+    background-color: #F5F5F5
+    border: none
+    margin: auto
+    padding: 0px
+    min-height: inherit
+
+  .btn-contact-us
+    background-color: #3878DE
+    border: none
+    color: #FFFFFF
+    font-size: 18px
+    margin-top: 20px
+    padding: 20px
+    width: 330px
+    text-decoration: none
+    text-transform: uppercase
+
+    div
+      text-align: left
+
+    img
+      float: left
+      margin-right: 10px
+
+
+  .btn-create-account, .btn-enter-courses
+    background-color: #09AC48
+    color: #FFFFFF
+    display: inline-block
+    font-size: 18px
+    margin: 10px
+    padding: 24px
+    width: 400px
+    text-decoration: none
+    text-transform: uppercase
+
+  .btn-login-account
+    color: #FFFFFF
+    text-decoration: underline
+
+  .btn-setup-class
+    margin-top: 20px
+    text-transform: uppercase
+    width: 300px
+
+  .section-header
+    font-family: Merriweather
+    font-size: 23px
+    line-height: 29px
+    padding: 0px 24px 0px 24px
+    border-bottom: 1px solid lightgray
+
+  .section-subheader
+    font-family: Helvetica, sans-serif
+    font-size: 13px
+    color: #727272
+    line-height: 15px
+
+  .text-right
+    text-align: right
+
+  #top-page-content
+    background-image: url('/images/pages/sales/hero_background.png')
+    background-size: cover
+    color: #FFFFFF
+
+    td
+      vertical-align: top
+
+    .big-quote-mark
+      font-family: Merriweather
+      font-size: 130px
+      font-weight: 700
+      line-height: 130px
+      margin-right: 0px
+      opacity: 0.5
+
+    .hero-quote-container
+      margin: 20px 20px 20px 0px
+      width: 60%
+
+    .hero-quote
+      color: #FFFFFF
+      font-family: Merriweather
+      font-size: 38px
+      font-weight: 700
+      line-height: 48px
+
+    .hero-quote-attribution
+      font-family: Helvetica, sans-serif
+      font-style: italic
+      font-size: 15px
+      color: #FFFFFF
+      line-height: 20px
+      margin-right: 100px
+      text-align: right
+
+    #down-arrow
+      padding: 20px
+
+  #main-content
+    text-align: left
+    display: inline-block
+    width: 850px
+
+    #blurb1
+      padding: 0px 20px 0px 20px
+
+    .blurb-subtitle
+      font-size: 17px
+      font-weight: bold
+
+    #course-comparisons
+      font-size: 12px
+      margin: 20px
+      width: 90%
+
+      img
+        width: 100%
+
+    .img-caption
+      font-family: Helvetica, sans-serif
+      font-style: italic
+      font-size: 11px
+      color: #727272
+      line-height: 13px
+
+    .img-face
+      background-color: #f0e5c7
+      border-radius: 50%
+      height: 100px
+      width: 100px
+
+    .img-game
+      width: 100%
+
+    .teacher-quote
+      font-family: Merriweather
+      font-weight: 300
+      font-size: 18px
+      line-height: 20px
+
+    .teacher-name
+      font-family: Helvetica, sans-serif
+      font-weight: 700
+      font-size: 16px
+      line-height: 19px
+
+    .teacher-location
+      font-family: Helvetica, sans-serif
+      font-style: italic
+      font-size: 12px
+      line-height: 14px
+
+    #quote1-container
+      background-image: url('/images/pages/sales/quote1.png')
+      background-repeat: no-repeat
+      background-size: 100% auto
+      height: 265px
+      padding: 12px
+      margin-right: 10px
+
+      .hero-quote-attribution
+        margin-top: 60px
+
+    #quote2-container
+      background-image: url('/images/pages/sales/quote2.png')
+      background-repeat: no-repeat
+      background-size: 100% auto
+      height: 265px
+      padding: 12px
+      margin-left: 10px
+
+      .teacher-quote
+        margin-top: 60px
+
+      .hero-quote-attribution
+        margin-top: 20px
+
+    .twitter-attribution
+      font-family: Helvetica
+      font-weight: 700
+      font-size: 11px
+      line-height: 14px
+      color: black
+      display: inline-block
+      text-decoration: none
diff --git a/app/templates/about.jade b/app/templates/about.jade
index 066dfec8f..e4c139ce0 100644
--- a/app/templates/about.jade
+++ b/app/templates/about.jade
@@ -51,9 +51,9 @@ block content
       h2(data-i18n="nav.contact")
         | Contact
       p
-        span CodeCombat, Inc.
+        span CodeCombat Inc.
         br
-        span 188 King St #507
+        span 360 3rd St Suite 700 (Livefyre)
         br
         span San Francisco, CA 94107
         br
@@ -219,3 +219,14 @@ block content
               | Customer Advocate
             p(data-i18n="about.maka_blurb")
               | Storyteller
+
+        li.row
+
+          img(src="/images/pages/about/robin_small.png").img-thumbnail
+          .team_bio
+            h4.team_name
+              | Robin Yang
+            p(data-i18n="about.robin_title")
+              | UX Design & Research
+            p(data-i18n="about.robin_blurb")
+              | Scaffolding
\ No newline at end of file
diff --git a/app/templates/account/job-profile-code-modal.jade b/app/templates/account/job-profile-code-modal.jade
deleted file mode 100644
index f63332818..000000000
--- a/app/templates/account/job-profile-code-modal.jade
+++ /dev/null
@@ -1,12 +0,0 @@
-extends /templates/core/modal-base
-
-block modal-header-content
-  h3 Applicant Code for
-    span.spl= view.session.get('levelName')
-
-block modal-body-content
-  .level-session-code-view
-
-block modal-footer
-  .modal-footer
-    button(data-dismiss="modal", data-i18n="modal.close").btn Close
diff --git a/app/templates/account/job-profile-treema-view.jade b/app/templates/account/job-profile-treema-view.jade
deleted file mode 100644
index 6ec836343..000000000
--- a/app/templates/account/job-profile-treema-view.jade
+++ /dev/null
@@ -1,28 +0,0 @@
-h3(data-i18n="account_settings.job_profile") Job Profile
-
-.row
-  .col-md-9
-    if me.get('jobProfileApproved')
-      p.lead(data-i18n="account_settings.job_profile_approved") Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks.
-    else
-      p.lead(data-i18n="account_settings.job_profile_explanation") Hi! Fill this out, and we will get in touch about finding you a software developer job.
-
-    .row
-      .col-md-9
-        .progress.profile-completion-progress
-          .progress-bar.progress-bar-success
-        .progress-next-item
-
-      .col-md-3
-        a.btn.btn-large.btn-primary.profile-preview-button.top-preview(href="/account/profile/#{me.id}", target="job_profile", data-i18n="account_settings.view_profile") View Your Profile
-
-  .col-md-3
-    .thumbnail.sample-profile-thumbnail
-      a(href="http://codecombat.com/images/pages/account/profile/sample_profile.png", target="_blank")
-        img(src="/images/pages/account/profile/sample_profile_thumb.png" alt="Sample Profile Thumbnail")
-        .caption
-          span(data-i18n="account_settings.sample_profile") See a sample profile
-
-#job-profile-treema
-
-a.btn.btn-large.btn-primary.profile-preview-button.bottom-preview(href="/account/profile/#{me.id}", target="job_profile", data-i18n="account_settings.view_profile") View Your Profile
diff --git a/app/templates/account/job-profile-view.jade b/app/templates/account/job-profile-view.jade
deleted file mode 100644
index f0dae7d07..000000000
--- a/app/templates/account/job-profile-view.jade
+++ /dev/null
@@ -1,495 +0,0 @@
-extends /templates/base
-
-block content
-  if !allowedToEditJobProfile && me.get('anonymous') == true
-    div(class="job-profile-container")
-      h1#login-message 
-        |Please 
-        a.login-button login 
-        | to view this profile.
-  else if user.loaded
-    if allowedToEditJobProfile
-      .profile-control-bar
-        if editing
-          .progress.profile-completion-progress
-            .progress-bar.progress-bar-success(style="width: #{100 * progress}%")
-            .progress-text
-        a.btn(href="/account/settings")
-          i.icon-cog
-          span(data-i18n="account_profile.settings") Settings
-        if editing
-          button.btn.btn-success#toggle-editing
-            i.icon-ok
-            span(data-i18n="account_profile.done_editing") Done Editing
-        else
-          button.btn#toggle-editing
-            i.icon-cog
-            span(data-i18n="account_profile.edit_profile") Edit Profile
-        if profile && profile.active
-          button.btn.btn-success#toggle-job-profile-active
-            i.icon-eye-open
-            span(data-i18n="account_profile.active") Looking for interview offers now
-        else
-          button.btn#toggle-job-profile-active
-            i.icon-eye-close
-            span(data-i18n="account_profile.inactive") Not looking for offers right now
-        if profile && (profile.active || me.isAdmin())
-          if profileApproved
-            button.btn.btn-success#toggle-job-profile-approved(disabled=!me.isAdmin())
-              i.icon-eye-open
-              span(data-i18n='account_profile.featured') Featured
-          else if me.isAdmin()
-            button.btn#toggle-job-profile-approved
-              i.icon-eye-close
-              span(data-i18n='account_profile.not_featured') Not Featured
-        if me.isAdmin() && !myProfile
-          button.btn#enter-espionage-mode 007
-        if me.isAdmin()
-          button.btn#open-model-modal Raw
-  
-    if profile && allowedToViewJobProfile
-      div(class="job-profile-container" + (editing ? " editable-profile" : ""))
-        .job-profile-row
-          .left-column.full-height-column
-            .sub-column
-              #profile-photo-container.editable-section(title="Click to change your photo")
-                .editable-icon.glyphicon.glyphicon-pencil
-                img.profile-photo(src=user.getPhotoURL(240, true))
-                .profile-caption= profile.jobTitle || 'Software Developer'
-  
-              #links-container.editable-section
-                .editable-display(title="Click to add social and personal links")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if profileLinks && profileLinks.length
-                    ul.links.editable-thinner
-                      each link in profileLinks
-                        if link.link && link.name
-                          li(title=profile.name + " on " + link.name, class=link.icon ? "has-icon" : "")
-                            a(href=link.link)
-                              if link.icon
-                                img(src=link.icon.url, alt=link.icon.name)
-                              else
-                                button.btn.btn-large.btn-inverse.flat-button= link.name
-                  else if editing
-                    h3.edit-label(data-i18n="account_profile.add_links") Add some links
-                    ul.links
-                      li.has-icon
-                        a(href='http://example.com')
-                          img(src='/images/pages/account/profile/icon_github.png', alt='GitHub')
-                      li.has-icon
-                        a(href='http://example.com')
-                          img(src='/images/pages/account/profile/icon_facebook.png', alt='Facebook')
-                      li.has-icon
-                        a(href='http://example.com')
-                          img(src='/images/pages/account/profile/icon_twitter.png', alt='Twitter')
-                      li.has-icon
-                        a(href='http://example.com/')
-                          img(src='/images/pages/account/profile/icon_linkedin.png', alt='LinkedIn')
-                    button.btn.btn-large.btn-inverse.flat-button.edit-example-button(data-i18n="account_profile.example_blog") Blog
-                    button.btn.btn-large.btn-inverse.flat-button.edit-example-button(data-i18n="account_profile.example_personal_site") Personal Site
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  h3(data-i18n="account_profile.links_header") Personal Links
-                  p.help-block(data-i18n="account_profile.links_blurb") Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog.
-                  .editable-array(data-property='links')
-                    for link, index in (profile.links || []).concat({})
-                      .array-item.link-container.well.well-sm
-                        .form-group
-                          label.control-label(data-i18n="account_profile.links_name") Link Name
-                          input.form-control(type='link-name', maxlength='30', data-schemaformat='link-name', name="root[links][#{index}][name]", value=link.name, data-autocomplete="commonLinkNames", data-autocomplete-min-length=0)
-                          if !index
-                            p.help-block
-                              span(data-i18n="account_profile.links_name_help") What are you linking to?
-                              |  Ex.: 'Personal Website', 'GitHub'
-                        .form-group
-                          label.control-label(data-i18n="account_profile.links_link") Link URL
-                          input.form-control(type='url', pattern='^(ht|f)tp(s?)://[0-9a-zA-Z]([-.w]*[0-9a-zA-Z])*(:(0-9)*)*(/?)([a-zA-Z0-9-‌​.?,\'/\+&%$#_=]*)?$', data-schemaformat='url', name="root[links][#{index}][link]", value=link.link)
-                          if !index
-                            p.help-block Ex.: "https://github.com/nwinter"
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-              .editable-section#basic-info-container
-                - var editableDefaults = editing && !rawProfile.city
-                div(class="editable-display" + (editableDefaults ? " edit-example-text" : ""), title="Click to edit your basic info")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if editableDefaults
-                    h3.edit-label(data-i18n="account_profile.basics_header") Update basic info
-                  div= profile.city + ', ' + profile.country
-                  div= profile.visa
-                  div
-                    span(data-i18n="account_profile.looking_for") Looking for:
-                    |  #{profile.lookingFor}
-                  div
-                    span(data-i18n="account_profile.last_updated") Last updated:
-                    |  #{moment(profile.updated).fromNow()}
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_active") Open to Offers
-                    select.form-control(name='root[active]')
-                      option(value='1', selected=profile.active, data-i18n="account_profile.active") Looking for interview offers now
-                      option(value='', selected=!profile.active, data-i18n="account_profile.inactive") Not looking for offers right now
-                    p.help-block(data-i18n="account_profile.basics_active_help") Want interview offers right now?
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_job_title") Desired Job Title
-                    input.form-control(type='text', maxlength='50', name='root[jobTitle]', value=profile.jobTitle)
-                    p.help-block
-                      span(data-i18n="account_profile.basics_job_title_help") What role are you looking for?
-                      |  Ex.: "Full Stack Engineer", "Front-End Developer", "iOS Developer"
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_city") City
-                    input.form-control(type='city', maxlength='100', data-schemaformat='city', name='root[city]', value=profile.city, data-autocomplete="commonCities", data-autocomplete-min-length=1)
-                    p.help-block
-                      span(data-i18n="account_profile.basics_city_help") City you want to work in (or live in now).
-                      |  Ex.: "San Francisco", "Lubbock, TX"
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_country") Country
-                    input.form-control(type='country', maxlength='100', data-schemaformat='country', name='root[country]', value=profile.country, data-autocomplete="commonCountries", data-autocomplete-min-length=1)
-                    p.help-block
-                      span(data-i18n="account_profile.basics_country_help") Country you want to work in (or live in now).
-                      |  Ex.: "USA", "France"
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_visa") US Work Status
-                    select.form-control(name='root[visa]')
-                      option(value='Authorized to work in the US', selected=profile.visa == 'Authorized to work in the US') Authorized to work in the US
-                      option(value='Need visa sponsorship', selected=profile.visa == 'Need visa sponsorship') Need visa sponsorship
-                    p.help-block(data-i18n="account_profile.basics_visa_help") Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)
-                  .form-group
-                    label.control-label(data-i18n="account_profile.basics_looking_for") Looking For
-                    select.form-control(name='root[lookingFor]')
-                      option(value='Full-time', selected=profile.lookingFor == "Full-time", data-i18n="account_profile.basics_looking_for_full_time") Full-time
-                      option(value='Part-time', selected=profile.lookingFor == "Part-time", data-i18n="account_profile.basics_looking_for_part_time") Part-time
-                      option(value='Remote', selected=profile.lookingFor == "Remote", data-i18n="account_profile.basics_looking_for_remote") Remote
-                      option(value='Contracting', selected=profile.lookingFor == "Contracting", data-i18n="account_profile.basics_looking_for_contracting") Contracting
-                      option(value='Internship', selected=profile.lookingFor == "Internship", data-i18n="account_profile.basics_looking_for_internship") Internship
-                    p.help-block(data-i18n="account_profile.basics_looking_for_help") What kind of developer position do you want?
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-              if !editing && !myProfile
-                button#contact-candidate.btn.btn-large.btn-inverse.flat-button
-                  span(data-i18n="account_profile.contact") Contact
-                  |  #{(profile.name || user.get('name') || 'Anonymous').split(' ')[0]}
-              if me.isAdmin()
-                select#admin-contact.form-control
-                  for contact in adminContacts
-                    option(value=contact.id, selected=remark && remark.get('contact') == contact.id)= contact.name
-  
-              if !editing && sessions.length
-                h3(data-i18n="account_profile.player_code") Player Code
-                ul.sessions
-                  each session in sessions
-                    li
-                      a.session-link(data-session-id=session._id)
-                        span= session.levelName
-                        if session.team
-                          span.spl - #{session.team}
-                      if session.codeLanguage && session.codeLanguage != 'javascript'
-                        span.spl - #{{coffeescript: 'CoffeeScript', python: 'Python', lua: 'Lua', io: 'Io', clojure: 'Clojure'}[session.codeLanguage]}
-              if !editing && !sessions.length
-                h3(data-i18n="account_profile.player_code") Player Code
-                p This player hasn't submitted code to our more recent tournaments.
-          .middle-column.full-height-column
-            .sub-column
-              #name-container.editable-section
-                .editable-display(title="Click to fill in your name")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if editing && !profile.name
-                    h3.edit-label(data-i18n="account_profile.name_header") Fill in your name
-                  else if profile.name
-                    h3= profile.name + (me.isAdmin() ? ' (' + user.get('name') + ')' : '')
-                  else
-                    h3
-                      span(data-i18n="account_profile.name_anonymous") Anonymous Developer
-                      if me.isAdmin()
-                        span  (#{user.get('name')})
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  .form-group
-                    label.control-label(data-i18n="general.name") Name
-                    input.form-control(type='text', maxlength='100', name='root[name]', value=profile.name)
-                    p.help-block(data-i18n="account_profile.name_help") Name you want employers to see, like 'Nick Winter'.
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-  
-              #short-description-container.editable-section
-                .editable-display(title="Click to write your tagline")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if editing && !rawProfile.shortDescription
-                    h3.edit-label(data-i18n="account_profile.short_description_header") Write a short description of yourself
-                    p.edit-example-text(data-i18n="account_profile.short_description_blurb") Add a tagline to help an employer quickly learn more about you.
-  
-                  else if profile.shortDescription
-                    p.editable-thinner= profile.shortDescription
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  .form-group
-                    label.control-label(data-i18n="account_profile.short_description") Tagline
-                    textarea.form-control(rows=3, maxlength='140', name='root[shortDescription]')= profile.shortDescription
-                    p.help-block(data-i18n="account_profile.short_description_help") Who are you, and what are you looking for? 140 characters max.
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-  
-              #skills-container.editable-section
-                .editable-display.editable-thinner(title="Click to tag your programming skills")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if editing && (!profile.skills || !profile.skills.length || (profile.skills.length == 1 && profile.skills[0] == 'javascript'))
-                    h3.edit-label Tag your programming skills
-                    each skill in ["python", "coffeescript", "node", "ios", "objective-c", "javascript", "app-engine", "mongodb", "web dev", "django", "backbone"]
-                      code.edit-example-tag= skill
-                      span  
-                  else
-                    each skill in profile.skills
-                      code= skill
-                      span  
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  h3(data-i18n="account_profile.skills_header") Skills
-                  p.help-block
-                    span(data-i18n="account_profile.skills_help") Tag relevant developer skills in order of proficiency.
-                    |  Ex.: "objective-c", "mongodb", "rails", "android", "javascript"
-                  .editable-array(data-property='skills')
-                    for skill, index in (profile.skills || []).concat('')
-                      .array-item.skill-array-item
-                        input.form-control(type='skill', maxlength='20', pattern='.{1,}', data-schemaformat='skill', name="root[skills][#{index}]", value=skill, data-autocomplete="commonSkills", data-autocomplete-min-length=1)
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-  
-              #long-description-container.editable-section
-                .editable-display(title="Click to start writing your longer description")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  - var modified = rawProfile.longDescription
-                  if editing && !modified
-                    h3.edit-label(data-i18n="account_profile.long_description_header") Describe your desired position
-                    p.edit-example-text(data-i18n="account_profile.long_description_blurb") Tell employers how awesome you are and what role you want.
-                  else if modified
-                    div.long-description.editable-thinner!= marked(profile.longDescription)
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  .form-group
-                    label.control-label(data-i18n="account_profile.long_description") Self Description
-                    textarea.form-control(rows=20, maxlength='600', data-schemaformat='markdown', name='root[longDescription]')= profile.longDescription
-                    p.help-block(data-i18n="account_profile.long_description_help") Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max.
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-              #work-container.editable-section
-                .editable-display(title="Click to add work experience")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if profile.work && profile.work.length
-                    h3.experience-header
-                      img.header-icon(src="/images/pages/account/profile/work.png", alt="")
-                      span(data-i18n="account_profile.work_experience") Work Experience
-                      |  - #{profile.experience}
-                      | 
-                      span(data-i18n=profile.experience == 1 ? "units.year" : "units.years")
-                    each job in profile.work
-                      if job.role && job.employer
-                        div.experience-entry
-                          div.duration.pull-right= job.duration
-                          | #{job.role} at #{job.employer}
-                          .clearfix
-                          if job.description
-                            div!= marked(job.description)
-                  else if editing
-                    h3.experience-header.edit-label(data-i18n="account_profile.work_header") Chronicle your work history
-  
-                    div.experience-entry.edit-example-text
-                        div.duration.pull-right June, 2012 - present
-                        | UX Designer at Hooli
-                        .clearfix
-                        div Revolutionized CSS, refactored flattening, and designed all the things.
-  
-                    div.experience-entry.edit-example-text
-                        div.duration.pull-right 1999 - 2012
-                        | Software Engineer at Initrode
-                        .clearfix
-                        div Built a P2P streaming TPS report fulfillment system.
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  h3(data-i18n="account_profile.work_experience") Work Experience
-                  .form-group
-                    label.control-label(data-i18n="account_profile.work_years") Years of Experience
-                    input.form-control(type='text', name='root[experience]', value=profile.experience)
-                    p.help-block(data-i18n="account_profile.work_years_help") How many years of professional experience (getting paid) developing software do you have?
-                  p(data-i18n="account_profile.work_blurb") List your relevant work experience, most recent first.
-                  .editable-array(data-property='work')
-                    for job, index in (profile.work || []).concat({})
-                      .array-item.well.well-sm
-                        .form-group
-                          label.control-label(data-i18n="account_profile.work_employer") Employer
-                          input.form-control(type='text', maxlength='100', name="root[work][#{index}][employer]", value=job.employer)
-                          p.help-block(data-i18n="account_profile.work_employer_help") Name of your employer.
-                        .form-group
-                          label.control-label(data-i18n="account_profile.work_role") Job Title
-                          input.form-control(type='text', maxlength='100', name="root[work][#{index}][role]", value=job.role)
-                          p.help-block(data-i18n="account_profile.work_role_help") What was your job title or role?
-                        .form-group
-                          label.control-label(data-i18n="account_profile.work_duration") Duration
-                          input.form-control(type='text', maxlength='100', name="root[work][#{index}][duration]", value=job.duration)
-                          p.help-block
-                            span(data-i18n="account_profile.work_duration_help") When did you hold this gig?
-                            |  Ex.: "Feb 2013 - present".
-                        .form-group
-                          label.control-label(data-i18n="account_profile.work_description") Description
-                          textarea.form-control(rows=3, maxlength='140', name="root[work][#{index}][description]")= job.description
-                          p.help-block(data-i18n="account_profile.work_description_help") What did you do there? (140 chars; optional)
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-  
-              #education-container.editable-section
-                .editable-display(title="Click to add academic experience")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if profile.education && profile.education.length
-                    h3.experience-header
-                      img.header-icon(src="/images/pages/account/profile/education.png", alt="")
-                      span(data-i18n="account_profile.education") Education
-                    each school in profile.education
-                      if school.degree && school.school
-                        div.experience-entry
-                          div.duration.pull-right= school.duration
-                          | #{school.degree} at #{school.school}
-                          .clearfix
-                          if school.description
-                            div!= marked(school.description)
-                  else if editing
-                    h3.experience-header.edit-label(data-i18n="account_profile.education_header") Recount your academic ordeals
-  
-                    div.experience-entry.edit-example-text
-                      div.duration.pull-right 1995 - 1997
-                      | Ph.D. Janitorial Science at MIT
-                      .clearfix
-                      div Anonymously solved problems in algebraic graph theory. Swept floors.
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  h3(data-i18n="accont_profile.education") Education
-                  p(data-i18n="account_profile.education_blurb") List your academic ordeals.
-                  .editable-array(data-property='education')
-                    for school, index in (profile.education || []).concat({})
-                      .array-item.well.well-sm
-                        .form-group
-                          label.control-label(data-i18n="account_profile.education_school") School
-                          input.form-control(type='text', maxlength='100', name="root[education][#{index}][school]", value=school.school)
-                          p.help-block(data-i18n="account_profile.education_school_help") Name of your school.
-                        .form-group
-                          label.control-label(data-i18n="account_profile.education_degree") Degree
-                          input.form-control(type='text', maxlength='100', name="root[education][#{index}][degree]", value=school.degree)
-                          p.help-block
-                            span(data-i18n="account_profile.education_degree_help") What was your degree and field of study?
-                            |  Ex.: "Ph.D. Human-Computer Interaction (incomplete)"
-                        .form-group
-                          label.control-label(data-i18n="account_profile.education_duration") Dates
-                          input.form-control(type='text', maxlength='100', name="root[education][#{index}][duration]", value=school.duration)
-                          p.help-block
-                            span(data-i18n="account_profile.education_duration_help") When?
-                            |  Ex.: "Aug 2004 - May 2008".
-                        .form-group
-                          label.control-label(data-i18n="account_profile.education_description") Description
-                          textarea.form-control(rows=3, maxlength='140', name="root[education][#{index}][description]")= school.description
-                          p.help-block(data-i18n="account_profile.education_description_help") Highlight anything about this educational experience. (140 chars; optional)
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-  
-              if user.get('jobProfileNotes') || me.isAdmin()
-                div(class="our-notes-section" + (editing ? " deemphasized" : ""))
-                  h3.experience-header(data-i18n="account_profile.our_notes") CodeCombat's Notes
-                  - var notes = user.get('jobProfileNotes') || '';
-                  if me.isAdmin()
-                    textarea#job-profile-notes!= notes
-                    button.btn.btn-primary#save-notes-button(data-i18n="common.save") Save
-                  else
-                    div!= marked(notes)
-  
-              if me.isAdmin()
-                h3(data-i18n="account_profile.remarks") Remarks
-                #remark-treema
-  
-          .right-column.full-height-column
-            .sub-column
-              #projects-container.editable-section
-                .editable-display(title="Click to add your projects")
-                  .editable-icon.glyphicon.glyphicon-pencil
-                  if profile.projects && profile.projects.length
-                    h3(data-i18n="account_profile.projects") Projects
-                    ul.projects
-                      each project in profile.projects
-                        if project.name
-                          li
-                            if project.link && project.link.length && project.link != 'http://example.com'
-                              a(href=project.link)
-                            if project.picture
-                              .project-image(style="background-image: url('/file/" + project.picture + "')")
-                            p= project.name
-                            div!= marked(project.description)
-                  else if editing
-                    h3.edit-label(data-i18n="account_profile.projects_header") Add 3 projects
-                    ul.projects
-                      li.edit-example-text
-                        .project-image(style="background-image: url('/images/pages/account/profile/sample_project.png')")
-                        p Cog.js
-                        div JS microlibrary to animate fixie bike cogs on ecommerce sites that sell bike hardware.
-                      li.edit-example-text
-                        .project-image(style="background-image: url('/images/pages/account/profile/sample_project.png')")
-                        p Combjoy
-                        div Ember.js project that schedules hair stylists to ride in Ubers with you to comb your hair on your way to work.
-                      li.edit-example-text
-                        .project-image(style="background-image: url('/images/pages/account/profile/sample_project.png')")
-                        p Bass Drop
-                        div Insert a few lines of JS into your site and get a "Drop the bass!" button for your website. Plays techno.
-  
-                form.editable-form
-                  .editable-icon.glyphicon.glyphicon-remove
-                  h3(data-i18n="account_profile.projects_header_2") Projects (Top 3)
-                  p(data-i18n="account_profile.projects_blurb") Highlight your projects to amaze employers.
-                  for index in [0, 1, 2]
-                    - var project = (profile.projects || [])[index] || {};
-                    .array-item.well.well-sm
-                      .form-group
-                        label.control-label(data-i18n="account_profile.projects_name") Project Name
-                        input.form-control(type='text', maxlength='100', name="root[projects][#{index}][name]", value=project.name)
-                        p.help-block(data-i18n="account_profile.projects_name_help") What was the project called?
-                      .form-group
-                        label.control-label(data-i18n="account_profile.projects_description") Description
-                        textarea.form-control(rows=6, maxlength='400', data-schemaformat='markdown', name="root[projects][#{index}][description]")= project.description
-                        p.help-block(data-i18n="account_profile.projects_description_help") Briefly describe the project.
-                      .form-group
-                        label.control-label(data-i18n="account_profile.projects_picture") Picture
-                        .project-image(style="background-image: url('" + (src=project.picture ? "/file/" + project.picture : "/images/pages/account/profile/sample_project.png") + "')")
-                        input(type="hidden", name="root[projects][#{index}][picture]", value=project.picture)
-                        p.help-block(data-i18n="account_profile.projects_picture_help") Upload a 230x115px or larger image showing off the project.
-                      .form-group
-                        label.control-label(data-i18n="account_profile.projects_link") Link
-                        input.form-control(type='url', pattern='^(ht|f)tp(s?)://[0-9a-zA-Z]([-.w]*[0-9a-zA-Z])*(:(0-9)*)*(/?)([a-zA-Z0-9-‌​.?,\'/\+&%$#_=]*)?$', data-schemaformat='url', name="root[projects][#{index}][link]", value=project.link)
-                        p.help-block(data-i18n="account_profile.projects_link_help") Link to the project.
-                  button.btn.btn-success.btn-block.save-section(data-i18n="common.save") Save
-  
-    else if allowedToViewJobProfile
-      .public-profile-container
-        h2(data-i18n="common.loading") Loading...
-  
-    else if user
-      .public-profile-container
-        h2
-          span(data-i18n="account_profile.profile_for_prefix") Profile for 
-          span= user.get('name') || "Anonymous Wizard"
-          span(data-i18n="account_profile.profile_for_suffix")  
-
-        if user.loaded
-          img.profile-photo(src=user.getPhotoURL(256))
-  
-        p To see a private user profile, you may need to log in.
-  
-    else
-      .public-profile-container
-        h2
-          span(data-i18n="account_profile.profile_for_prefix") Profile for 
-          span= userID
-          span(data-i18n="account_profile.profile_for_suffix") 
-          |  
-          span(data-i18n="loading_error.not_found")
diff --git a/app/templates/account/prepaid-view.jade b/app/templates/account/prepaid-view.jade
index fc6069300..d10c0f9ad 100644
--- a/app/templates/account/prepaid-view.jade
+++ b/app/templates/account/prepaid-view.jade
@@ -39,7 +39,7 @@ block content
                   label.control-label.col-md-2(data-i18n="account_prepaid.purchase_total")
                   .col-md-10
                     p.form-control-static $
-                      span#total #{purchase.total.toFixed(2)}
+                      span#total #{(purchase.total/100).toFixed(2)}
                 button#purchase-btn.btn.btn-success.pull-right(data-i18n="account_prepaid.purchase_button")
     .row
       .col-md-12
@@ -66,7 +66,7 @@ block content
                   button#redeem-code-btn.btn.btn-success(data-i18n="account_prepaid.apply_account")
     .row
       .col-md-12
-        .panel.panel-default
+        #codes-panel.panel.panel-default
           .panel-heading
             .panel-title
               a(data-toggle="collapse" href="#codeslist")
diff --git a/app/templates/account/subscription-sale-view.jade b/app/templates/account/subscription-sale-view.jade
deleted file mode 100644
index 1f32bc8d6..000000000
--- a/app/templates/account/subscription-sale-view.jade
+++ /dev/null
@@ -1,76 +0,0 @@
-extends /templates/base
-
-block content
-
-  ol.breadcrumb
-    li
-      a(href="/")
-        span.glyphicon.glyphicon-home
-    li
-      a(href="/account", data-i18n="nav.account")
-    li
-      a(href="/account/subscription", data-i18n="account.subscription")
-    li.active(data-i18n="account.sale") Sale
-
-  if hasSubscription
-    h1(data-i18n="subscribe.sale_already_subscribed")
-    span.spr(data-i18n="subscribe.sale_continue")
-    a(href="/play", data-i18n="subscribe.sale_click_here")
-  else
-    if state === 'purchasing'
-      .alert.alert-info(data-i18n="account_invoices.purchasing")
-    else
-      if view.onSale
-        div.sale-ends
-          if new Date() < saleEndDate
-            span.spr(data-i18n="subscribe.sale_ends")
-            span #{moment(saleEndDate).fromNow()}
-          else
-            span(data-i18n="subscribe.sale_limited_time")
-      if view.onSale
-        h1.center(data-i18n="subscribe.sale_title")
-        p.center
-          img(src="/images/pages/account/subscription/teacher-banner.png")
-        br
-      .above-blurb
-        p.sale-blurb
-          strong.spr(data-i18n="subscribe.sale_blurb1")
-          span(data-i18n="subscribe.sale_blurb2")
-        br
-        div
-          .sale-blurb(data-i18n="subscribe.sale_feature_here")
-          ul
-            li.feature-description(data-i18n="[html]subscribe.sale_feature2")
-            li.feature-description(data-i18n="subscribe.feature3")
-            li.feature-description(data-i18n="[html]subscribe.sale_feature4")
-            li.feature-description(data-i18n="subscribe.feature5")
-            li.feature-description(data-i18n="[html]subscribe.feature7")
-        div.sub-extended(data-i18n="subscribe.sale_extended")
-      br
-      p.center
-        button.btn.btn-success#pay-button #{payButtonText}
-      table.above-blurb(cellpadding="8")
-        tr
-          td(colspan=2)
-            h2.center(data-i18n="subscribe.sale_new_heroes")
-        each hero in heroes
-          if hero.get('extendedName') !== 'Captain Anya Weston' && hero.get('extendedName') !== 'Sir Tharin Thunderfist'
-            tr
-              td
-                img(src="http://codecombat.com#{hero.getPortraitURL()}")
-              td
-                p.sale-blurb #{hero.name}
-                p #{hero.class}
-                p #{hero.description}
-      br
-      if state === 'declined'
-        #declined-alert.alert.alert-danger.alert-dismissible
-          span(data-i18n="account_invoices.declined")
-          button.close(type="button" data-dismiss="alert")
-            span(aria-hidden="true") &times;
-      if state === 'unknown_error'
-        #error-alert.alert.alert-danger.alert-dismissible
-          button.close(type="button" data-dismiss="alert")
-            span(aria-hidden="true") &times;
-          p(data-i18n="loading_error.unknown")
-          p= stateMessage
diff --git a/app/templates/account/subscription-view.jade b/app/templates/account/subscription-view.jade
index 38d62b152..c3f61d7de 100644
--- a/app/templates/account/subscription-view.jade
+++ b/app/templates/account/subscription-view.jade
@@ -133,54 +133,12 @@ block content
     .panel.panel-default
       .panel-heading
         h3(data-i18n="subscribe.managed_subs")
-        p(data-i18n="subscribe.managed_subs_desc")
-        p(data-i18n="subscribe.managed_subs_desc_2")
-        h4(data-i18n="subscribe.group_discounts")
-        table.table.table-striped.table-condensed.discount-table
-          tr
-            td(data-i18n="subscribe.group_discounts_1st")
-            td(data-i18n="subscribe.group_discounts_full")
-          tr
-            td(data-i18n="subscribe.group_discounts_2nd")
-            td(data-i18n="subscribe.group_discounts_20")
-          tr
-            td(data-i18n="subscribe.group_discounts_12th")
-            td(data-i18n="subscribe.group_discounts_40")
-      .panel-body
-        if view.recipientSubs.state === 'subscribing'
-          .alert.alert-info(data-i18n="subscribe.subscribing")
-        else
-          if emailValidator.state === 'invalid'
-            div.invalid-email-message(aria-hidden="true") please make sure all entries are valid emails
-          textarea.recipient-emails(rows=3, data-i18n="[placeholder]subscribe.recipient_emails_placeholder")=emailValidator.lastEmails
-          div
-            button.recipients-subscribe-button.btn.btn-lg.btn-success(data-i18n="subscribe.subscribe_users")
-          if view.recipientSubs.state === 'declined'
-            br
-            .alert.alert-danger.alert-dismissible
-              span(data-i18n="buy_gems.declined")
-              button.close(type="button" data-dismiss="alert")
-                span(aria-hidden="true") &times;
-          else if view.recipientSubs.state === 'unknown_error'
-            br
-            .alert.alert-danger.alert-dismissible
-              button.close(type="button" data-dismiss="alert")
-                span(aria-hidden="true") &times;
-              p(data-i18n="loading_error.unknown")
-              p= view.recipientSubs.stateMessage
-          else if view.recipientSubs.justSubscribed && view.recipientSubs.justSubscribed.length > 0
-            br
-            .alert.alert-success.alert-dismissible
-              if view.recipientSubs.justSubscribed.length > 0
-                div(data-i18n="subscribe.users_subscribed")
-                ul
-                  each email in view.recipientSubs.justSubscribed
-                    li= email
-          else if view.recipientSubs.justSubscribed && view.recipientSubs.justSubscribed.length === 0
-            br
-            .alert.alert-success.alert-dismissible
-              div(data-i18n="subscribe.no_users_subscribed")
+        p
+          span.spr Managed subscriptions are discontinued. Please contact
+          a(href='mailto:team@codecombat.com') team@codecombat.com
+          span.spl for more information.
 
+      .panel-body
         if view.recipientSubs.nextPaymentAmount > 0 && view.recipientSubs.sponsorSub
           h4(data-i18n="account.next_payment")
           p= moment(new Date(view.recipientSubs.sponsorSub.current_period_end * 1000)).format('l')
diff --git a/app/templates/admin.jade b/app/templates/admin.jade
index d28abcba7..864fe1041 100644
--- a/app/templates/admin.jade
+++ b/app/templates/admin.jade
@@ -27,10 +27,6 @@ block content
   ul
     li
       a(href="/admin/level-sessions", data-i18n="admin.av_entities_active_instances_url") Active Instances
-    li
-      a(href="/admin/candidates", data-i18n="admin.av_entities_candidates_list_url") Candidate List
-    li
-      a(href="/admin/employers", data-i18n="admin.av_entities_employer_list_url") Employer List
     li
       a(href="/admin/trial-requests") Trial Requests
     li
diff --git a/app/templates/admin/candidates.jade b/app/templates/admin/candidates.jade
deleted file mode 100644
index c13f34702..000000000
--- a/app/templates/admin/candidates.jade
+++ /dev/null
@@ -1,110 +0,0 @@
-extends /templates/base
-block content
-  if !me.isAdmin()
-    h1 Admins Only
-  if me.isAdmin()
-    h1(data-i18n="employers.want_to_hire_our_players") Hire CodeCombat Players
-    if !isEmployer && !me.isAdmin()
-      div#info_wrapper
-        div#leftside
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon1.png")
-            h2(data-i18n="employers.what") What is CodeCombat?
-            p(data-i18n="employers.what_blurb") CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io.
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon3.png")
-            h2(data-i18n="employers.who") Who Are the Players?
-            p(data-i18n="employers.who_blurb") CodeCombateers are CTOs, VPs of Engineering, and graduates of top 20 engineering schools. No junior developers here. Our players enjoy playing with code and solving problems.
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon5.png")
-            h2(data-i18n="employers.cost") Who Are the Players?
-            p(data-i18n="employers.cost_blurb") CodeCombateers are CTOs, VPs of Engineering, and graduates of top 20 engineering schools. No junior developers here. Our players enjoy playing with code and solving problems.
-        div#rightside
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon2.png")
-            h2(data-i18n="employers.how") How Much Do we Charge?
-            p(data-i18n="employers.how_blurb") We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company.
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon4.png")
-            h2(data-i18n="employers.why") Why Hire Through Us?
-            p
-              span(data-i18n="employers.why_blurb_1") We will save you time. Every CodeCombateer we feaure is 
-              strong(data-i18n="employers.why_blurb_2") looking for work
-              span(data-i18n="employers.why_blurb_3") , has 
-              strong(data-i18n="employers.why_blurb_4") demonstrated top notch technical skills
-              span(data-i18n="employers.why_blurb_5") , and has been 
-              strong(data-i18n="employers.why_blurb_6") personally screened by us
-              span(data-i18n="employers.why_blurb_7") . Stop screening and start hiring.
-          div.information_row
-            img(class="employer_icon" src="/images/pages/employer/employer_icon6.png")
-            h2(data-i18n="employers.response") What's the Response Rate?
-            p(data-i18n="employers.response_blurb") Almost every developer you contact on CodeCombat will respond to inquires whether or not they want to interivew. If you would like help finding a candidate for your role, we can make recommendations.
-    if candidates.length
-      ul.nav.nav-pills
-        li.active
-          a(href="#featured-candidates", data-toggle="tab")
-            span.spr(data-i18n="employers.featured_developers") Featured Developers
-            | (#{featuredCandidates.length})
-        if otherCandidates.length
-          li
-            a(href="#other-candidates", data-toggle="tab")
-              span.spr(data-i18n="employers.other_developers") Other Developers
-              | (#{otherCandidates.length})
-        if me.isAdmin() && inactiveCandidates.length
-          li
-            a(href="#inactive-candidates", data-toggle="tab")
-              span.spr(data-i18n="employers.inactive_developers") Inactive Developers
-              | (#{inactiveCandidates.length})
-      div.tab-content
-        for area, tabIndex in [{id: "featured-candidates", candidates: featuredCandidates}, {id: "other-candidates", candidates: otherCandidates}, {id: "inactive-candidates", candidates: inactiveCandidates}]
-          div(class="tab-pane well" + (tabIndex ? "" : " active"), id=area.id)
-            table.table.table-condensed.table-hover.table-responsive.tablesorter
-              thead
-                tr
-                  th(data-i18n="general.name") Name
-                  th(data-i18n="employers.candidate_location") Location
-                  th(data-i18n="employers.candidate_looking_for") Looking For
-                  th(data-i18n="employers.candidate_role") Role
-                  th(data-i18n="employers.candidate_top_skills") Top Skills
-                  th(data-i18n="employers.candidate_years_experience") Yrs Exp
-                  th(data-i18n="employers.candidate_last_updated") Last Updated
-                  if me.isAdmin()
-                    th(data-i18n="employers.candidate_who") Who
-                  if me.isAdmin() && area.id == 'inactive-candidates'
-                    th ✓?
-              tbody
-                for candidate, index in area.candidates
-                  - var profile = candidate.get('jobProfile', true);
-                  - var authorized = candidate.id;  // If we have the id, then we are authorized.
-                  - var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000;
-                  - var expired = profileAge > 2 * 30.4;
-                  tr(data-candidate-id=candidate.id, id=candidate.id, class=expired ? "expired" : "")
-                    td
-                      if authorized
-                        img(src=candidate.getPhotoURL(50), alt=profile.name, title=profile.name, height=50)
-                        if profile.name
-                          p= profile.name
-                        else if me.isAdmin()
-                          p (#{candidate.get('name')})
-                      else
-                        img(src="/images/pages/contribute/archmage.png", alt="", title="Sign up as an employer to see our candidates", width=50)
-                        p Developer ##{index + 1 + (area.id == 'featured-candidates' ? 0 : featuredCandidates.length)}
-                    if profile.country == 'USA'
-                      td= profile.city
-                    else
-                      td= profile.country
-                    td= profile.lookingFor
-                    td= profile.jobTitle
-                    td
-                      each skill in profile.skills
-                        code= skill
-                        span
-                    td= profile.experience
-                    td(data-profile-age=profileAge)= moment(profile.updated).fromNow()
-                    if me.isAdmin()
-                      td= remarks[candidate.id] ? remarks[candidate.id].get('contactName') : ''
-                    if me.isAdmin() && area.id == 'inactive-candidates'
-                      if candidate.get('jobProfileApproved')
-                        td ✓
-                      else
-                        td ✗
\ No newline at end of file
diff --git a/app/templates/admin/employer_list.jade b/app/templates/admin/employer_list.jade
deleted file mode 100644
index f61e5ba1c..000000000
--- a/app/templates/admin/employer_list.jade
+++ /dev/null
@@ -1,70 +0,0 @@
-extends /templates/base
-
-block content
-
-  if !me.isAdmin()
-    h1 Admin Only
-  else
-    h1(data-i18n="admin.av_entities_employer_list_url") Employer List
-  
-    p
-      | We currently have 
-      if employers.length
-        | #{employers.length}
-      else
-        | ...
-      |  employers in the system.
-  
-    if employers.length
-      table.table.table-condensed.table-hover.table-responsive.tablesorter
-        thead
-          tr
-            th(data-i18n="general.name") Name
-            th Company
-            th(data-i18n="general.email") Email
-            th Logins
-            th Candidates Viewed
-            th Candidates Contacted
-            th Signed Up
-    
-        tbody
-          for employer, index in employers
-            - var activity = employer.get('activity') || {};
-            - var hasLinkedIn = typeof employer.get('signedEmployerAgreement') !== "undefined";
-            - var emptyDate = {date: Date.now()};
-            - var linkedIn = hasLinkedIn ? employer.get('signedEmployerAgreement').data : emptyDate;
-            tr(data-employer-id=employer.id)
-              td
-                img(src=employer.getPhotoURL(50), height=50)
-                p
-                  if employer.get('firstName')
-                    span= employer.get('firstName') + ' ' + employer.get('lastName')
-                    if employer.get('name')
-                      |  - 
-                  else if linkedIn.firstName
-                    span= linkedIn.firstName + ' ' + linkedIn.lastName
-                    if employer.get('name')
-                      |  - 
-                  if employer.get('name')
-                    span= employer.get('name')
-                  if !employer.get('firstName') && !linkedIn.firstName && !employer.get('name')
-                    | Anoner
-              td
-                if employer.get('signedEmployerAgreement')
-                  a(href=employer.get('signedEmployerAgreement').data.publicProfileUrl)= employer.get('employerAt')
-                else
-                  | Unknown
-              td= employer.get('email')
-              for a in ['login', 'view_candidate', 'contact_candidate']
-                - var act = activity[a];
-                if act
-                  td
-                    strong= act.count
-                    |  
-                    br
-                    span= moment(act.first).fromNow()
-                    br
-                    span= moment(act.last).fromNow()
-                else
-                  td 0
-              td(data-employer-age=(new Date() - new Date(linkedIn.date)) / 86400 / 1000)= moment(employer.get('signedEmployerAgreement') ? employer.get('signedEmployerAgreement').date : linkedIn.date).fromNow()
diff --git a/app/templates/admin/level_sessions.jade b/app/templates/admin/level_sessions.jade
index aac3aed6e..1eda21b44 100644
--- a/app/templates/admin/level_sessions.jade
+++ b/app/templates/admin/level_sessions.jade
@@ -4,7 +4,7 @@ block content
 
   h1(data-i18n="admin.lg_title") Latest Games
 
-  each session in sessions
+  each session in view.sessions.models
     - var url = '/play/level/'+session.get('levelID')+'?session='+session.id
     .session_tile
       a(href=url)
diff --git a/app/templates/base.jade b/app/templates/base.jade
index ba459d45a..c8bd3c72b 100644
--- a/app/templates/base.jade
+++ b/app/templates/base.jade
@@ -10,7 +10,7 @@ block header
           span.glyphicon.glyphicon-home
         a(href='/teachers', data-i18n="nav.teachers") Teachers
         a(href='/courses', data-i18n="nav.courses")
-        a(href='http://discourse.codecombat.com/', data-i18n="nav.forum")
+        a(href=view.forumLink(), data-i18n="nav.forum")
         a(href='/community', data-i18n="nav.community")
 
         if me.get('anonymous') === false
diff --git a/app/templates/core/modal-base.jade b/app/templates/core/modal-base.jade
index 98f843662..e8cf3db4b 100644
--- a/app/templates/core/modal-base.jade
+++ b/app/templates/core/modal-base.jade
@@ -3,19 +3,19 @@
     .modal-content
       block modal-header
         .modal-header
-          if closeButton
+          if view.closeButton
             .button.close(type="button", data-dismiss="modal", aria-hidden="true") &times;
           block modal-header-content
-            if headerContent
-              h3!= headerContent
+            if view.options.headerContent
+              h3!= view.options.headerContent
             else
               h3 man bites God
-          
+
       block modal-body
         .modal-body
           block modal-body-content
-            if bodyContent
-              div!= bodyContent
+            if view.options.bodyContent
+              div!= view.options.bodyContent
             else
               p Man Bites God are the bad boys of the Melbourne live music and comedy scene. It is like being drowned in a bathtub of harmony.
               img(src="http://www.manbitesgod.com/images/picturecoupleb.jpg")
diff --git a/app/templates/core/subscribe-modal.jade b/app/templates/core/subscribe-modal.jade
index d2be043b0..978ca5890 100644
--- a/app/templates/core/subscribe-modal.jade
+++ b/app/templates/core/subscribe-modal.jade
@@ -23,9 +23,12 @@
             if !me.isOnPremiumServer()
               th.free-cell(data-i18n="subscribe.free")
             th
-              //- TODO: find a better way to localize '$9.99/month'
-              span $#{(view.product.amount / 100)}/
-              span(data-i18n="subscribe.month")
+              //- TODO: find a better way to localize price
+              if view.basicProduct
+                span $#{(view.basicProduct.get('amount') / 100)}/
+                span(data-i18n="subscribe.month")
+              else
+                span '...'
         tbody
           tr
             td.feature-description
diff --git a/app/templates/courses/activate-licenses-modal.jade b/app/templates/courses/activate-licenses-modal.jade
index df27d28ae..944c44188 100644
--- a/app/templates/courses/activate-licenses-modal.jade
+++ b/app/templates/courses/activate-licenses-modal.jade
@@ -4,7 +4,8 @@ block modal-header-content
   .clearfix
   .text-center
     h2(data-i18n="courses.enroll_paid")
-    p= view.classroom.get('name')
+    if view.classroom
+      p= view.classroom.get('name')
 
 block modal-body-content
   - var usedLic = view.prepaids.totalRedeemers();
diff --git a/app/templates/courses/course-enroll.jade b/app/templates/courses/course-enroll.jade
index 8671ef335..00af1b6cc 100644
--- a/app/templates/courses/course-enroll.jade
+++ b/app/templates/courses/course-enroll.jade
@@ -87,12 +87,6 @@ block content
       +trial-and-questions
 
 mixin trial-and-questions
-  //- h3(data-i18n="courses.free_trial")
-  //- p
-  //-   span.spr(data-i18n="teachers.teacher_subs_1")
-  //-   a(href='/teachers/freetrial', data-i18n="teachers.teacher_subs_2")
-  //-   span.spl(data-i18n="courses.get_access")
-
   h3(data-i18n="courses.questions")
   p
     span.spr(data-i18n="teachers_survey.contact_1")
diff --git a/app/templates/courses/purchase-courses-view.jade b/app/templates/courses/purchase-courses-view.jade
index 07dab6137..3bba3b638 100644
--- a/app/templates/courses/purchase-courses-view.jade
+++ b/app/templates/courses/purchase-courses-view.jade
@@ -82,7 +82,7 @@ block content
         span(data-i18n="account_prepaid.purchase_total")
         span.spr : #{view.numberOfStudents}
         span(data-i18n="courses.enrollments")
-        span.spl x $#{view.pricePerStudent.toFixed(2)} = #{view.getPriceString()}
+        span.spl x $#{(view.pricePerStudent/100).toFixed(2)} = #{view.getPriceString()}
 
     p.text-center
       button#purchase-btn.btn.btn-lg.btn-success.uppercase(data-i18n="courses.purchase_now")
diff --git a/app/templates/courses/teacher-courses-view.jade b/app/templates/courses/teacher-courses-view.jade
index 7978acd53..87a713336 100644
--- a/app/templates/courses/teacher-courses-view.jade
+++ b/app/templates/courses/teacher-courses-view.jade
@@ -21,7 +21,7 @@ block content
             strong.uppercase(data-i18n="courses.getting_started")
           br
           .text-center
-            a.btn.btn-info(href='http://codecombat.com/docs/CodeCombatHourofCodeGettingStartedGuide.pdf', data-i18n="courses.download_getting_started")
+            a.btn.btn-info(href='http://codecombat.com/docs/CodeCombatCoursesGettingStartedGuide.pdf', data-i18n="courses.download_getting_started")
           br
           ol
             li(data-i18n="courses.getting_started_1")
@@ -43,6 +43,10 @@ block content
               span.spr(data-i18n="courses.additional_resources_3_pref")
               a(href='http://discourse.codecombat.com/c/teachers', data-i18n="courses.additional_resources_3_mid")
               span.spl(data-i18n="courses.additional_resources_3_suff")
+            li
+              span.spr(data-i18n="courses.additional_resources_4_pref")
+              a(href='/schools', data-i18n="courses.additional_resources_4_mid")
+              span.spl(data-i18n="courses.additional_resources_4_suff")
 
   .section-header(data-i18n="courses.your_classes")
 
@@ -64,6 +68,7 @@ block content
       strong.spr(data-i18n="courses.unused_enrollments")
       strong.spr= view.prepaids.totalAvailable()
       a.btn.btn-success.btn(href="/courses/purchase", data-i18n="courses.purchase_enrollments")
+      button#activate-licenses-btn.btn.btn-info(data-i18n="courses.enroll_paid")
 
   p(data-i18n="courses.students_access")
 
@@ -96,10 +101,16 @@ mixin classroom(classroom)
           else
             span.spr.class-name (Python)
           a.edit-classroom-small(data-i18n="courses.edit_settings", data-classroom-id="#{classroom.id}")
+          if classMemberCount === 1
+            p There is #{classMemberCount} student in this class.
+          else
+            p There are #{classMemberCount} students in this class.
           .active-courses(data-i18n="courses.active_courses")
           - var courseInstances = view.courseInstances.where({classroomID: classroom.id});
-          each courseInstance in courseInstances
-            +course(courseInstance, classMemberCount)
+          table.active-course-container
+            each courseInstance in courseInstances
+              tr
+                +course(courseInstance, classMemberCount)
     else
       .col-md-12
         p
@@ -126,13 +137,12 @@ mixin course(courseInstance, classMemberCount)
   - var courseMemberCount = courseInstance.get('members') ? courseInstance.get('members').length : 0;
   if courseMemberCount > 0
     - var course = view.courses.get(courseInstance.get('courseID'));
-    p
-      .course-name= course.get('name')
-      .course-enrolled
+    td
+      span.course-name= course.get('name')
+    td
+      span.course-enrolled
         span #{courseMemberCount} / #{classMemberCount}
         span.spl(data-i18n="courses.students_enrolled")
-      each concept in course.get('concepts')
-        span.spr.course-concept(data-i18n="concepts." + concept)
 
 mixin course-info(course)
   .media
diff --git a/app/templates/editor/campaign/campaign-editor-view.jade b/app/templates/editor/campaign/campaign-editor-view.jade
index 54176c7a7..b65cc8cdc 100644
--- a/app/templates/editor/campaign/campaign-editor-view.jade
+++ b/app/templates/editor/campaign/campaign-editor-view.jade
@@ -1,7 +1,7 @@
 extends /templates/base
 
 block header
-  if campaign.loading
+  if view.campaign.loading
     nav.navbar.navbar-default(role='navigation')#campaign-editor-top-nav
       .container-fluid
         ul.nav.navbar-nav
diff --git a/app/templates/editor/component/thang-component-config-view.jade b/app/templates/editor/component/thang-component-config-view.jade
index 80535c740..425188ee9 100644
--- a/app/templates/editor/component/thang-component-config-view.jade
+++ b/app/templates/editor/component/thang-component-config-view.jade
@@ -1,7 +1,7 @@
 .panel.panel-default
-  .panel-heading(class=isDefaultComponent ? "is-default-component" : "")
-    em #{component.system}.
-    strong.panel-title.spr= component.name
-    span#description.text-muted= component.description
+  .panel-heading(class=view.isDefaultComponent ? "is-default-component" : "")
+    em #{view.component.attributes.system}.
+    strong.panel-title.spr= view.component.attributes.name
+    span#description.text-muted= view.component.attributes.description
   .panel-body
     .treema
diff --git a/app/templates/editor/level/component/new.jade b/app/templates/editor/level/component/new.jade
index 94aea8a77..79e11aac8 100644
--- a/app/templates/editor/level/component/new.jade
+++ b/app/templates/editor/level/component/new.jade
@@ -8,9 +8,8 @@ block modal-body-content
     .form-group
       label(for="level-component-system", data-i18n="editor.new_component_field_system").control-label System
       select.form-control#level-component-system(name='system')
-        for system in systems
+        for system in view.systems
           option(value=system)= system
-      //input.form-control#level-component-system(name="system", type="text")
     .form-group
       label(for="level-component-name", data-i18n="general.name").control-label Name
       input.form-control#level-component-name(name="name", type="text")
diff --git a/app/templates/editor/level/modal/generate-terrain-modal.jade b/app/templates/editor/level/modal/generate-terrain-modal.jade
index f522ba5b5..ad696b1e6 100644
--- a/app/templates/editor/level/modal/generate-terrain-modal.jade
+++ b/app/templates/editor/level/modal/generate-terrain-modal.jade
@@ -5,8 +5,8 @@ block modal-header-content
 
 block modal-body-content
   div#normal-view
-    each sizeObject, size in presetSizes
-      each preset in presets
+    each sizeObject, size in view.presetSizes
+      each preset in view.presets
         a(href="#")
           div.choose-option(data-preset-type=preset.type, data-preset-size=size, style="background:url(/images/pages/editor/level/preset_"+preset.type+"_"+size+".jpg) no-repeat center; background-size: cover")
             div.preset-size.name-label.capitalize
diff --git a/app/templates/editor/level/modal/new-achievement.jade b/app/templates/editor/level/modal/new-achievement.jade
index 3c083e204..83083e9a2 100644
--- a/app/templates/editor/level/modal/new-achievement.jade
+++ b/app/templates/editor/level/modal/new-achievement.jade
@@ -13,7 +13,7 @@ block modal-body-content
       label
         input(type="checkbox", name="queryOptions" id="misc-level-completion" value="misc-level-completion")
         span.spl(data-i18n="editor.level_completion") Level Completion
-    - var goals = level.get('goals');
+    - var goals = view.level.get('goals');
     if goals && goals.length
       h4(data-i18n="editor.achievement_query_goals") Key achievement off of level goals
       each goal in goals
diff --git a/app/templates/editor/level/related-achievements.jade b/app/templates/editor/level/related-achievements.jade
index 934ea706d..6f496866d 100644
--- a/app/templates/editor/level/related-achievements.jade
+++ b/app/templates/editor/level/related-achievements.jade
@@ -1,6 +1,6 @@
 button.btn.btn-primary#new-achievement-button(disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true" data-i18n="editor.new_achievement_title") Create a New Achievement
 
-if !achievements.models.length
+if !view.achievements.models.length
   .panel
     .panel-body
       p(data-i18n="editor.no_achievements") No achievements added for this level yet.
@@ -13,7 +13,7 @@ else
         th(data-i18n="general.description") Description
         th XP
     tbody
-      each achievement in achievements.models
+      each achievement in view.achievements.models
         tr
           td(style="width: 20px")
             img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
diff --git a/app/templates/editor/level/system/level-system-edit-view.jade b/app/templates/editor/level/system/level-system-edit-view.jade
index c76fc5bc9..05d85ec2a 100644
--- a/app/templates/editor/level/system/level-system-edit-view.jade
+++ b/app/templates/editor/level/system/level-system-edit-view.jade
@@ -37,8 +37,8 @@ nav.navbar.navbar-default(role='navigation')
           a(data-i18n="general.version_history") Version History
 
   .navbar-header
-    span.navbar-brand= editTitle
-  
+    span.navbar-brand= view.levelSystem.get('name')
+
 .tab-content
   .tab-pane.active#system-code
     #system-code-editor
diff --git a/app/templates/editor/modal/new-model-modal.jade b/app/templates/editor/modal/new-model-modal.jade
index 1e6e78f4f..8d07ff4ed 100644
--- a/app/templates/editor/modal/new-model-modal.jade
+++ b/app/templates/editor/modal/new-model-modal.jade
@@ -1,7 +1,7 @@
 extends /templates/core/modal-base
 
 block modal-header-content
-  h3(data-i18n="#{newModelTitle}") Create New #{modelLabel}
+  h3(data-i18n="#{view.newModelTitle}") Create New #{view.modelLabel}
 
 block modal-body-content
   form.form
diff --git a/app/templates/editor/modal/save-version-modal.jade b/app/templates/editor/modal/save-version-modal.jade
index 03201a653..3014936c0 100644
--- a/app/templates/editor/modal/save-version-modal.jade
+++ b/app/templates/editor/modal/save-version-modal.jade
@@ -1,18 +1,18 @@
 extends /templates/core/modal-base
 
 block modal-header-content
-  if isPatch
+  if view.isPatch
     h3(data-i18n="common.submit_patch") Submit Patch
   else
     h3(data-i18n="versions.save_version_title") Save New Version
 
 block modal-body-content
-  if hasChanges
+  if view.hasChanges
     .changes-stub
     form.form-inline
       .form-group.commit-message
         input.form-control#commit-message(name="commitMessage", type="text")
-      if !isPatch
+      if !view.isPatch
         .checkbox
           label
             input#major-version(name="version-is-major", type="checkbox")
@@ -21,25 +21,25 @@ block modal-body-content
     .alert.alert-danger(data-i18n="delta.no_changes") No changes
 
 block modal-body-wait-content
-  if hasChanges
-    if isPatch
+  if view.hasChanges
+    if view.isPatch
       h3(data-i18n="versions.submitting_patch") Submitting Patch...
     else
       h3(data-i18n="common.saving") Saving...
 
 block modal-footer-content
-  if hasChanges
+  if view.hasChanges
     #accept-cla-wrapper.alert.alert-info
       span.spr(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
       strong#cla-link(data-i18n="versions.cla_url") CLA
       span(data-i18n="versions.cla_suffix") .
       button.btn.btn-sm#agreement-button(data-i18n="versions.cla_agree") I AGREE
-    if isPatch
+    if view.isPatch
       .alert.alert-info(data-i18n="versions.owner_approve") An owner will need to approve it before your changes will become visible.
 
   .buttons
     button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel
-    if hasChanges && !isPatch
+    if view.hasChanges && !view.isPatch
       button.btn.btn-primary#save-version-button(data-i18n="common.save") Save
-    if hasChanges && isPatch
+    if view.hasChanges && view.isPatch
       button.btn.btn-primary#submit-patch-button(data-i18n="common.submit_patch") Submit Patch
diff --git a/app/templates/editor/thangTasksView.jade b/app/templates/editor/thangTasksView.jade
new file mode 100644
index 000000000..6574a4807
--- /dev/null
+++ b/app/templates/editor/thangTasksView.jade
@@ -0,0 +1,29 @@
+extends /templates/base
+
+block content
+  #thang-tasks-view
+    input#nameSearch(placeholder='Filter: Thang Name')
+    br
+    input#descSearch(placeholder='Filter: Task Description')
+    hr
+    if view.processedThangs
+      table.table.table-striped#thangTable
+        tr
+          th Thang Name
+          th Task List
+        for thang in view.processedThangs
+          if view.hasIncompleteTasks(thang)
+            +thangRow(thang)
+    else
+      span No view.processedThangs
+
+mixin thangRow(thang)
+  tr
+    td.taskOwner
+      a(href= 'thang/' + thang.get('slug'))= thang.get('name')
+    td.tasks
+      table.table-striped.table-hover.tasksTable
+        for task in (thang.tasks || [])
+          if !task.complete
+            tr
+              td= task.name
\ No newline at end of file
diff --git a/app/templates/employers.jade b/app/templates/employers.jade
deleted file mode 100644
index 1fb9fed2b..000000000
--- a/app/templates/employers.jade
+++ /dev/null
@@ -1,188 +0,0 @@
-extends /templates/recruitment_base
-
-block content
-  .deprecation-warning
-    h1(data-i18n="employers.deprecation_warning_title") Sorry, CodeCombat is not recruiting right now.
-    p(data-i18n="employers.deprecation_warning") We are focusing on beginner levels instead of finding expert developers for the time being.
-
-  //.deprecated
-  //  .artisanal-claim
-  //  if me.get('anonymous')
-  //    a#login-link(data-i18n="login.log_in") Log In
-  //    br
-  //  if !isEmployer && !me.isAdmin()
-  //    #tagline
-  //      h1(data-i18n="employers.hire_developers_not_credentials") Hire developers, not credentials.
-  //      button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
-  //  else
-  //    if !me.get('anonymous')
-  //      a#logout-link(data-i18n="login.log_out") Log Out
-  //      br
-  //  .row
-  //    - var fullProfiles = isEmployer || me.isAdmin();
-  //
-  //    if fullProfiles
-  //      #filter-column.col-md-3
-  //        #filter
-  //          .panel-group#filter_panel
-  //            a#filter-link(data-toggle="collapse" data-target="#collapseOne")
-  //              .panel.panel-default
-  //                .panel-heading
-  //                  h4.panel-title
-  //                    span.glyphicon.glyphicon-folder-open#folder-icon
-  //                    | Filter
-  //            .panel-collapse.collapse.in#collapseOne
-  //              .panel-body
-  //                p
-  //                  strong(data-i18n="employers.already_screened") We've already technically screened all our candidates
-  //                  span(data-i18n="employers.filter_further") , but you can also filter further:
-  //                form#filters
-  //                    .filter_section#visa_filter
-  //                      h4(data-i18n="employers.filter_visa") Visa
-  //                      label
-  //                        input(type="checkbox" name="visa" value="Authorized to work in the US")
-  //                        span(data-i18n="employers.filter_visa_yes") US Authorized
-  //                        |  (#{candidatesInFilter("visa","Authorized to work in the US")})
-  //                      label
-  //                        input(type="checkbox" name="visa" value="Need visa sponsorship")
-  //                        span(data-i18n="employers.filter_visa_no") Not Authorized
-  //                        |  (#{candidatesInFilter("visa","Need visa sponsorship")})
-  //                    .filter_section#school_filter
-  //                      h4(data-i18n="account_profile.education") Education
-  //                      label
-  //                        input(type="checkbox" name="schoolFilter" value="Top School")
-  //                        span(data-i18n="employers.filter_education_top") Top School
-  //                        |  (#{candidatesInFilter("schoolFilter","Top School")})
-  //                      label
-  //                        input(type="checkbox" name="schoolFilter" value="Other")
-  //                        span(data-i18n="employers.filter_education_other") Other 
-  //                        |  (#{candidatesInFilter("schoolFilter","Other")})
-  //                    .filter_section#role_filter
-  //                      h4(data-i18n="employers.candidate_role") Role
-  //                      label
-  //                        input(type="checkbox" name="roleFilter" value="Web Developer")
-  //                        span(data-i18n="employers.filter_role_web_developer") Web Developer
-  //                        |  (#{candidatesInFilter("roleFilter","Web Developer")})
-  //                      label
-  //                        input(type="checkbox" name="roleFilter" value="Software Developer")
-  //                        span(data-i18n="employers.filter_role_software_developer") Software Developer
-  //                        |  (#{candidatesInFilter("roleFilter","Software Developer")})
-  //                      label
-  //                        input(type="checkbox" name="roleFilter" value="Mobile Developer")
-  //                        span(data-i18n="employers.filter_role_mobile_developer") Mobile Developer
-  //                        |  (#{candidatesInFilter("roleFilter","Mobile Developer")})
-  //                    .filter_section#seniority_filter
-  //                      h4(data-i18n="employers.filter_experience") Experience
-  //                      label
-  //                        input(type="checkbox" name="seniorityFilter" value="Senior")
-  //                        span(data-i18n="employers.filter_experience_senior") Senior
-  //                        |  (#{candidatesInFilter("seniorityFilter","Senior")})
-  //                      label
-  //                        input(type="checkbox" name="seniorityFilter" value="Junior")
-  //                        span(data-i18n="employers.filter_experience_junior") Junior
-  //                        |  (#{candidatesInFilter("seniorityFilter","Junior")})
-  //                      label
-  //                        input(type="checkbox" name="seniorityFilter" value="Recent Grad")
-  //                        span(data-i18n="employers.filter_experience_recent_grad") Recent Grad
-  //                        |  (#{candidatesInFilter("seniorityFilter","Recent Grad")})
-  //                      label
-  //                        input(type="checkbox" name="seniorityFilter" value="College Student")
-  //                        span(data-i18n="employers.filter_experience_student") College Student
-  //                        |  (#{candidatesInFilter("seniorityFilter","College Student")})
-  //
-  //                //input#select_all_checkbox(type="checkbox" name="select_all" checked)
-  //                //| Select all
-  //                p#results 
-  //                  | #{numberOfCandidates} 
-  //                  span(data-i18n="employers.results") results
-  //                h4#filter-alerts-heading Filter Email Alerts
-  //                p Get an email whenever a candidate meeting certain criteria enters the system.
-  //                table#saved-filter-table
-  //                  thead
-  //                    tr
-  //                      th Filters
-  //                      th Remove
-  //                  tbody
-  //                button.btn#create-alert-button Create Alert with Current Filters
-  //
-  //    #candidates-column(class=fullProfiles ? "full-profiles col-md-9" : "teaser-profiles col-md-12")
-  //      if candidates.length
-  //        #candidate-table
-  //          table
-  //            tbody
-  //              for candidate, index in featuredCandidates
-  //                - var profile = candidate.get('jobProfile');
-  //                - var authorized = candidate.id;  // If we have the id, then we are authorized.
-  //                - var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000;
-  //                - var expired = profileAge > 2 * 30.4;
-  //                - var curated = profile.curated;
-  //                - var photoSize = fullProfiles ? 75 : 50;
-  //
-  //                tr.candidate-row(data-candidate-id=candidate.id, id=candidate.id, class=expired ? "expired" : "")
-  //                  td(rowspan=3)
-  //                    - var photoURL = candidate.getPhotoURL(photoSize, false, true);
-  //                    div(class="candidate-picture " + (/^\/file/.test(photoURL) ? "" : "anonymous"), style='background-image: url(' + encodeURI(photoURL) + ')')
-  //                  if fullProfiles
-  //                    td.candidate-name-cell
-  //                      strong= profile.name
-  //                      |  - 
-  //                      span= profile.jobTitle
-  //                tr.description_row(data-candidate-id=candidate.id)
-  //                  if curated && curated.shortDescription
-  //                    td.candidate-description
-  //                      div #{curated.shortDescription}
-  //                  else
-  //                    td.candidate-description
-  //                      div #{profile.shortDescription}
-  //                tr.border_row(data-candidate-id=candidate.id)
-  //                  if curated
-  //                    - var workHistory = curated.workHistory.join(",");
-  //                    if !fullProfiles
-  //                      td.tag_column
-  //                        img(src="/images/pages/employer/tag.png")
-  //                        |  #{profile.jobTitle}
-  //                    td.location_column
-  //                      img(src="/images/pages/employer/location.png")
-  //                      |  #{curated.location}
-  //                    td.education_column
-  //                      img(src="/images/pages/employer/education.png")
-  //                      |  #{curated.education}
-  //                    td.work_column
-  //                      if workHistory
-  //                        img(src="/images/pages/employer/briefcase.png")
-  //                        |  #{workHistory}
-  //
-  //  if !fullProfiles
-  //    div#info_wrapper
-  //      span.hiring-call-to-action
-  //        h2#start-hiring(data-i18n="employers.start_hiring") Start hiring.
-  //        button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
-  //      
-  //      h2#hiring-reasons.hiring-call-to-action(data-i18n="employers.reasons") Three reasons you should hire through us:
-  //      .reasons#top_row
-  //        .reason
-  //          img.employer_icon(src="/images/pages/employer/employer_icon2.png")
-  //          h3(data-i18n="employers.everyone_looking") Everyone here is looking for their next opportunity.
-  //          p(data-i18n="employers.everyone_looking_blurb") Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction.
-  //        .reason
-  //          img.employer_icon(src="/images/pages/employer/employer_icon6.png")
-  //          h3(data-i18n="employers.weeding") Sit back; we've done the weeding for you.
-  //          p(data-i18n="employers.weeding_blurb") Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time.
-  //        .reason
-  //          img(class="employer_icon" src="/images/pages/employer/employer_icon3.png")
-  //          h3(data-i18n="employers.pass_screen") They will pass your technical screen.
-  //          p(data-i18n="employers.pass_screen_blurb") Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News.
-  //      span.hiring-call-to-action
-  //        h2(data-i18n="employers.make_hiring_easier") Make my hiring easier, please.
-  //        button.btn.get-started-button.employer-button(data-i18n="employers.get_started") Get Started
-  //      .reasons#bottom_row
-  //        .reason_long
-  //          img.employer_icon(src="/images/pages/employer/employer_icon1.png")
-  //          .reason_text
-  //            h3(data-i18n="employers.what") What is CodeCombat?
-  //            p(data-i18n="employers.what_blurb") CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io.
-  //        .reason_long
-  //          img.employer_icon(src="/images/pages/employer/employer_icon5.png")
-  //          .reason_text
-  //            h3(data-i18n="employers.cost") How much do we charge?
-  //            p(data-i18n="employers.cost_blurb") We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company.
diff --git a/app/templates/home-view.jade b/app/templates/home-view.jade
index 05a78e3c0..073116616 100644
--- a/app/templates/home-view.jade
+++ b/app/templates/home-view.jade
@@ -24,14 +24,7 @@ block outer_content
   //- #news
   //-   a(href="/play/ladder/ace-of-coders", data-i18n="temp.ace_of_coders_tournament") New: play in the Ace of Coders tournament now!
 
-  //- TODO: Delete HoC section and replace with slogan below
-  #hour-of-code
-    h1(data-i18n="home.hoc_title")
-    div
-      a.btn.btn-illustrated.btn-lg.btn-primary.btn-class-code(href='/courses', data-i18n="home.hoc_class_code")
-      a.btn.btn-illustrated.btn-lg.btn-success.btn-enter(href='/hoc', data-i18n="home.hoc_enter")
-
-  //- #slogan(data-i18n="home.slogan")
+  #slogan(data-i18n="home.slogan")
 
   //- TODO: This does not work on IE8
   .alert.alert-danger.lt-ie9
diff --git a/app/templates/legal.jade b/app/templates/legal.jade
index 5b0a600b6..64bac794d 100644
--- a/app/templates/legal.jade
+++ b/app/templates/legal.jade
@@ -52,8 +52,7 @@ block content
     if !me.isOnPremiumServer()
       h4(data-i18n="legal.cost_title")
         | Cost
-      p(data-i18n="legal.cost_description")
-        | CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee.
+      p#cost-description Loading...
     
   h2(data-i18n="legal.copyrights_title")
     | Copyrights and Licenses
@@ -167,6 +166,18 @@ block content
     | so that they may be charged for in the future, 
     | if that's what ends up happening.
   
+  h3(data-i18n="legal.third_party_title")
+    | Third Party Services
+  
+  p(data-i18n="legal.third_party_description")
+    | CodeCombat uses the following third party services (among others):
+
+  ul
+
+    a(href="https://www.browserstack.com/", data-i18n="browserstack_url")
+      | BrowserStack
+    span
+
   hr
 
   p(data-i18n="legal.canonical") The English version of this document is the definitive, canonical version.
diff --git a/app/templates/modal/employer_signup_modal.jade b/app/templates/modal/employer_signup_modal.jade
deleted file mode 100644
index 9b01e3666..000000000
--- a/app/templates/modal/employer_signup_modal.jade
+++ /dev/null
@@ -1,61 +0,0 @@
-extends /templates/core/modal-base
-
-block modal-header-content
-  if userIsAnonymous || !userIsAuthorized
-    h3(data-i18n="employer_signup.title") Sign Up to Hire CodeCombat Players
-  else
-    h3 CodeCombat Placement Agreement
-
-block modal-body-content
-  if userIsAnonymous
-    if userIsAuthorized
-      | You appear to be authorized on CodeCombat with LinkedIn. 
-    else if sentMoreInfoEmail
-      | Thanks! You should receive an email from George shortly.
-    else
-      .form#signup-form
-        .form-group
-          input#signup-email.form-control.input-large(name="email",type="email" placeholder="Email")
-        .form-group       
-          input#signup-password.input-large.form-control(name="password", type="password" placeholder="Password")
-      .modal-footer.linkedin
-        button.btn.btn-primary(id="create-account-button") Create Account
-        br
-        br
-        | Already have a CodeCombat account? 
-        a.login-link(data-toggle="coco-modal", data-target="core/AuthModal") Log in to continue!
-  else if !userIsAuthorized
-    .modal-footer.linkedin
-      p Please sign into your LinkedIn account to verify your identity.
-      script(type="in/Login" id="linkedInAuthButton" data-onAuth="contractCallback")
-
-  else 
-    | Please agree to our terms before accessing our candidates.
-    br
-    br
-    b Who we are: 
-    | CodeCombat is a programming game that both teaches and vets programmers. If you accept this agreement, we will let you hire the most talented developers on our platform. 
-    br
-    br
-    b Placement fee: 
-    | If you hire any of our players, you agree to pay us 15% of the candidate's first year annualized starting base salary. The fee is due on the first day that the candidate is employed and is 100% refundable for up to 90 day if the candidate doesn't remain employed at the company for any reason.
-    br
-    br
-    b Interns are free: 
-    | We will not bill you for interns and part time hires (remote or onsite) hired through this site, provided they do not become full time hires within 1 year of their start date. If they do become full time hires within 1 year of their start date, we will invoice you 15% of their first year's annualized starting base salary on their first day of full time employment. For these hires, the 90 day guarantee does not apply.
-    br
-    br
-    | By clicking Agree, you are agreeing to CodeCombat's Placement Agreement on behalf of your company. You also consent to CodeCombat storing basic LinkedIn profile data for verification purposes, including your name, email, public profile URL, and work history.
-block modal-footer
-  if userIsAnonymous   
-    if userIsAuthorized
-      .modal-footer.linkedin
-        a.login-link(data-toggle="coco-modal", data-target="core/AuthModal") Please log in to continue.
-  else if !userIsAnonymous && !userIsAuthorized
-    .modal-footer.linkedin
-  else if userIsAuthorized && !userHasSignedContract
-    .modal-footer.linkedin
-      button.btn.btn-primary(id="contract-agreement-button") I agree
-  else
-    .modal-footer.linkedin
-       | Thanks! You've already agreed to the contract.
diff --git a/app/templates/modal/job_profile_contact.jade b/app/templates/modal/job_profile_contact.jade
deleted file mode 100644
index 68d06f3c0..000000000
--- a/app/templates/modal/job_profile_contact.jade
+++ /dev/null
@@ -1,22 +0,0 @@
-extends /templates/core/contact
-
-block modal-header-content
-  h3(data-i18n="contact.contact_candidate") Contact Candidate
-
-block modal-body-content
-  p(data-i18n="contact.recruitment_reminder") Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns.
-  .form
-    .form-group
-      label.control-label(for="contact-email", data-i18n="general.email") Email
-      input#contact-email.form-control(name="email", type="email", value=me.get('email'), placeholder="Where should the candidate reply?")
-    .form-group
-      label.control-label(for="contact-subject", data-i18n="general.subject") Subject
-      input#contact-subject.form-control(name="subject", type="text", value="Job interest", placeholder="Subject of the email the candidate will receive.")
-    .form-group
-      label.control-label(for="contact-message", data-i18n="general.message") Message
-      textarea#contact-message.form-control(name="message", rows=8)
-
-block modal-footer-content
-  span.sending-indicator.pull-left.secret(data-i18n="common.sending") Sending...
-  a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="common.cancel").btn Cancel
-  button.btn.btn-primary#contact-submit-button(data-i18n="common.send") Send
diff --git a/app/templates/play/level/modal/hero-victory-modal.jade b/app/templates/play/level/modal/hero-victory-modal.jade
index 441436ac7..540962ddd 100644
--- a/app/templates/play/level/modal/hero-victory-modal.jade
+++ b/app/templates/play/level/modal/hero-victory-modal.jade
@@ -137,9 +137,10 @@ block modal-footer-content
         span(data-i18n="play_level.victory_hour_of_code_done_yes") Yes, I am finished with my Hour of Code!
       .clearfix
 
-  .offer.lost-viking
-    p
-      img.pull-left(src="/file/db/level/55144b509f0c4854051769c1/viking1.png")
-      img.pull-right(src="/file/db/level/55144b509f0c4854051769c1/viking_2.png")
-      span(data-i18n="play_level.victory_viking_code_school")
-    button.btn.btn-illustrated.btn-primary.btn-lg.world-map-button.continue-from-offer-button(data-i18n="play_level.victory_become_a_viking") Become a Viking
+  if view.level.get('slug') == 'lost-viking'
+    .offer.lost-viking
+      p
+        img.pull-left(src="/file/db/level/55144b509f0c4854051769c1/viking1.png")
+        img.pull-right(src="/file/db/level/55144b509f0c4854051769c1/viking_2.png")
+        span(data-i18n="play_level.victory_viking_code_school")
+      button.btn.btn-illustrated.btn-primary.btn-lg.world-map-button.continue-from-offer-button(data-i18n="play_level.victory_become_a_viking") Become a Viking
diff --git a/app/templates/play/level/tome/spell_list_entry_thangs.jade b/app/templates/play/level/tome/spell_list_entry_thangs.jade
index 1e7fa072f..bcc7804f1 100644
--- a/app/templates/play/level/tome/spell_list_entry_thangs.jade
+++ b/app/templates/play/level/tome/spell_list_entry_thangs.jade
@@ -1,3 +1,3 @@
 h4
-  span.spr(data-i18n="play_level.tome_select_a_thang") Select Someone for
+  span(data-i18n="play_level.tome_select_a_thang") Select Someone for 
   code #{view.spell.name}(#{(view.spell.parameters || []).join(", ")})
diff --git a/app/templates/play/level/tome/spell_palette_entry.jade b/app/templates/play/level/tome/spell_palette_entry.jade
index 5dfb2ae4f..40021508e 100644
--- a/app/templates/play/level/tome/spell_palette_entry.jade
+++ b/app/templates/play/level/tome/spell_palette_entry.jade
@@ -1 +1 @@
-span.doc-title(data-property-name=doc.name)= doc.title
\ No newline at end of file
+span.doc-title(data-property-name=view.doc.name)= view.doc.title
diff --git a/app/templates/play/modal/buy-gems-modal.jade b/app/templates/play/modal/buy-gems-modal.jade
index 340d21cb8..157b6dfb9 100644
--- a/app/templates/play/modal/buy-gems-modal.jade
+++ b/app/templates/play/modal/buy-gems-modal.jade
@@ -1,10 +1,10 @@
 .modal-dialog
   .modal-content
       
-    if state === 'purchasing'
+    if view.state === 'purchasing'
       .alert.alert-info(data-i18n="buy_gems.purchasing")
     
-    else if state === 'retrying'
+    else if view.state === 'retrying'
       #retrying-alert.alert.alert-danger(data-i18n="buy_gems.retrying")
 
     else
@@ -12,12 +12,12 @@
       h1(data-i18n="play.buy_gems")
       
       #products
-        for product in products
+        for product in view.products.models
           .product
-            h4 x#{product.gems}
-            h3(data-i18n=product.i18n)
-            button.btn.btn-illustrated.btn-lg(value=product.id)
-              span= product.price
+            h4 x#{product.get('gems')}
+            h3(data-i18n=product.get('i18n'))
+            button.btn.btn-illustrated.btn-lg(value=product.get('name'))
+              span= product.get('priceString')
 
         .product
           h4(data-i18n="buy_gems.price") x3500 / mo
@@ -29,20 +29,20 @@
           else
             button.start-subscription-button.btn.btn-lg.btn-illustrated.btn-success(data-i18n="subscribe.subscribe_title") Subscribe
                 
-      if state === 'declined'
+      if view.state === 'declined'
         #declined-alert.alert.alert-danger.alert-dismissible
           span(data-i18n="buy_gems.declined")
           button.close(type="button" data-dismiss="alert")
             span(aria-hidden="true") &times;      
           
-      if state === 'unknown_error'
+      if view.state === 'unknown_error'
         #error-alert.alert.alert-danger.alert-dismissible
           button.close(type="button" data-dismiss="alert")
             span(aria-hidden="true") &times;
           p(data-i18n="loading_error.unknown")
-          p= stateMessage
+          p= view.stateMessage
       
-      if state === 'recovered_charge'
+      if view.state === 'recovered_charge'
         #recovered-alert.alert.alert-danger.alert-dismissible
           span(data-i18n="buy_gems.recovered")
           button.close(type="button" data-dismiss="alert")
diff --git a/app/templates/sales-view.jade b/app/templates/sales-view.jade
new file mode 100644
index 000000000..5c045755a
--- /dev/null
+++ b/app/templates/sales-view.jade
@@ -0,0 +1,219 @@
+extends /templates/base
+
+//- Do NOT localize / i18n
+
+block content
+  #top-page-content
+    br
+    br
+    .text-right
+      button.btn-contact-us(href='/teachers/freetrial')
+        img(src='/images/pages/sales/chat_icon.png')
+        div contact us for pricing and a free trial
+
+    table
+      tr
+        td
+          .big-quote-mark “
+        td
+          .hero-quote-container
+            .hero-quote CodeCombat is without question the most engaging platform for learning programming languages.”
+            .hero-quote-attribution - Jonathan P., Elementary Computers Teacher
+
+    if me.isAnonymous()
+      .text-center
+        a.btn-create-account set up a free class
+      .text-center
+        span.spr Already have an account?
+        a.btn-login-account Log in here.
+    else
+      .text-center
+        a.btn-enter-courses(href="/courses/teachers") set up a free class
+
+    p.text-center
+      a(href='#getting-started')
+        img#down-arrow(src='/images/pages/sales/down_arrow.png')
+    a(name="getting-started")
+
+  .text-center
+    #main-content
+      br
+      p.text-center
+        span.section-header What are CodeCombat Courses?
+      p.text-center.section-subheader An entire semesters' worth of computer science curriculum for teachers who want to bring programming into their 4th-12th grade classes.
+      br
+
+      .row
+        .col-md-5
+          img#img-game(src='/images/pages/sales/screen1.png')
+          .text-center
+            i 
+              small Students learn by writing code to complete levels in the game.
+        .col-md-7
+          #blurb1
+            //- TODO: why don't jade inline tags work here?
+            //- http://stackoverflow.com/questions/10953326/what-is-a-concise-way-to-create-inline-elements-in-jade
+            p 
+              strong.spr CodeCombat
+              span.spr is a platform for students to learn programming all while playing a game with their classmates.  We believe in encouraging
+              strong.spr real, typed code
+              span to support healthy learning curve with programming.
+            p
+              span.spr CodeCombat's Courses consist of levels that have been specifically playtested to work best in a classroom setting, designed to be used by teachers with
+              strong.spr no prior coding experience necessary.
+              span Current Courses are available in JavaScript and Python, with solution guides provided for both.
+      br
+      br
+
+      .row
+        .col-md-7
+          #blurb2
+            p.text-center.blurb-subtitle Designed with Teachers in Mind
+            ul
+              li Intuitive dashboard to track student progress
+              li Course-specific teacher guides with full solutions to each levels
+              li Teachers' forum and community-generated lesson plans.
+              li Optional leaderboards to encourage friendly competitions
+              li
+                span.spr Auto-generate student progress reports
+                i (coming soon!)
+              li
+                span.spr Multiple administrative accounts
+                i (coming soon!)
+        .col-md-5
+          img.img-game(src='/images/pages/sales/screen2.png')
+          .text-center
+            i 
+              small Teachers can monitor progress, manage classrooms and more.
+
+      if me.isAnonymous()
+        br
+        .text-center
+          a.btn-create-account set up a free class
+        br
+        br
+
+      p.text-center
+        span.section-header Students (and parents) love us!
+      br
+
+      table
+        tr
+          td
+            #quote1-container
+              .teacher-quote
+                span.spr "My class had been struggling with the basics of Python all year. Today they were having fun and getting into it
+                strong - I think they actually forgot that they were actually learning something."
+              .row
+                .col-md-4
+                .col-md-8
+                  .hero-quote-attribution
+                    .teacher-name Tim M.
+                    .teacher-location Director of Technology, Tilton School
+          td
+            #quote2-container
+              .row
+                .col-md-8
+                  .hero-quote-attribution
+                    .teacher-name.text-right Darlease M.
+                    .teacher-location.text-right Technology Coordinator,
+                    .teacher-location.text-right Global Learning Charter Public School
+                .col-md-4
+              .teacher-quote
+                span.spr "My girls, who were apprehensive about taking a coding class, are some of my top students.
+                strong They work together and explain the code to each other to make sure each understands."
+      br
+
+      .text-center.section-subheader Students play CodeCombat during #HourOfCode 2015
+      table(cellpadding=4)
+        tr
+          td
+            img(src='/images/pages/sales/classroom3.png')
+            .text-right
+              a(href='https://twitter.com/flinng/status/674238468747354112')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @flinng
+          td
+            img(src='/images/pages/sales/classroom4.png')
+            .text-right
+              a(href='https://twitter.com/HikariKishi/status/674359511566577664')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @HikariKishi
+          td
+            img(src='/images/pages/sales/classroom2.png')
+            .text-right
+              a(href='https://twitter.com/Coderdojovno/status/675743290461941760')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @Coderdojovno
+      table(cellpadding=4)
+        tr
+          td
+            img(src='/images/pages/sales/classroom6.png')
+            .text-right
+              a(href='https://twitter.com/teachercoulter/status/674734565487828992')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @teachercoulter
+          td
+            img(src='/images/pages/sales/classroom1.png')
+            .text-right
+              a(href='https://twitter.com/CentreHigh/status/674643613360324608')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @CentreHigh
+          td
+            img(src='/images/pages/sales/classroom5.png')
+            .text-right
+              a(href='https://twitter.com/MrsYassen_GRE/status/674747949902090244')
+                img(src='/images/twitter_icon.png')
+                span.twitter-attribution @MrsYassen_GRE
+      br
+
+      p.blurb-subtitle Facts about CodeCombat:
+      .row
+        .col-md-6
+          ul
+            li Students collaborate and help each other solve levels.
+            li Appeals to all genders and a wide range of age groups.
+        .col-md-6
+          ul
+            li Typed code gives students an advantage over block-based programs.
+            li Success with both high-performing and low-performing students, as well as ESL.
+      br
+
+      .row
+        .col-md-8
+          p.text-center
+            span.section-header What are paid courses?
+          p The one-hour long "Introduction to Computer Science" course will always be free for an unlimited number of students. Paid enrollments allow each student access to Computer Science 2, 3, and 4, which is an additional 15 hours of content on top of the free content.  Paid enrollments never expire.
+
+          #course-comparisons
+            img(src='/images/pages/sales/content_table.png')
+          br
+
+          p Per-student pricing allows us to better support flexibility for both large and small schools. Contact us if you are interested in purchasing paid course enrollments for your classroom or school.  Free trials are also available upon request.
+
+        .col-md-4
+          .well 
+            p.text-center.blurb-subtitle Resources for Teachers
+            p
+              a(href='http://codecombat.com/docs/CodeCombatHourofCodeGettingStartedGuide.pdf')
+                img(src='/images/Adobe_PDF_file_icon_32x32.png')
+                span Getting Started Guide
+            p
+              a(href='http://codecombat.com/docs/CodeCombatTeacherGuideCourse1.pdf')
+                img(style='float:left;', src='/images/Adobe_PDF_file_icon_32x32.png')
+                span Introduction to Computer Science Teacher's Guide
+            br
+            p
+              i
+                small Solution guides and additional lesson plans available for paid courses.
+            p
+              i
+                small.spr Contact
+                a(href='mailto:team@codecombat.com') team@codecombat.com
+                small.spl with additional requests.
+      br
+      br
+
+      p.text-center
+        button.btn-contact-us contact us for a free trial
+      br
diff --git a/app/templates/teachers.jade b/app/templates/teachers.jade
index 13adfc60b..40e21e75e 100644
--- a/app/templates/teachers.jade
+++ b/app/templates/teachers.jade
@@ -15,14 +15,14 @@ block content
         .text-center
           .title 
             strong.spr Teachers
-            span - share CodeCombat's Hour of Code with your class!
+            span - try CodeCombat Courses in your classroom!
     .row
-      .col-md-4
-      .col-md-4
+      .col-md-2
+      .col-md-8
         p
           div In just one hour, students will learn:
           ul
-            li basic Python syntex
+            li basic Python syntax
             li arguments
             li strings
             li while loops
@@ -37,7 +37,7 @@ block content
 
   br
   br
-  h2.text-center Hour of Code FAQ
+  h2.text-center Frequently Asked Questions
 
   .container-fluid
     .row
@@ -47,9 +47,11 @@ block content
         p(data-i18n="teachers.who_for_1")
         p(data-i18n="teachers.who_for_2")
 
-        .faq-question Does it cost anything to play Hour of Code?
-        p No! The first hour of CodeCombat is completely free.
-        p Teachers, please see the free trial information above for further details.
+        .faq-question Does it cost anything to play CodeCombat?
+        p
+          span.spr The first course “Introduction to Computer Science” is completely free, and generally takes students an hour to complete. Students can be enrolled in additional courses spanning an entire semester's worth of topics with per-student pricing. We offer
+          a(href='/teachers/freetrial') free trials
+          span.spl for teachers who are interested in using CodeCombat Courses.
 
         .faq-question(data-i18n="teachers.more_info_title")
         p
diff --git a/app/templates/user/main-user-view.jade b/app/templates/user/main-user-view.jade
index b1bb6ec13..e08acb0eb 100644
--- a/app/templates/user/main-user-view.jade
+++ b/app/templates/user/main-user-view.jade
@@ -22,6 +22,10 @@ block append content
                 span(data-i18n="user.favorite_prefix") Favorite language is
                 strong.favorite-language= favoriteLanguage
                 span(data-i18n="user.favorite_postfix") .
+            if playerLevel
+              div.extra-info
+                span.spr(data-i18n="general.player_level") Level
+                strong= playerLevel
         - var emails = user.getEnabledEmails()
         // TODO: fix this, use some other method for finding contributor classes other than email settings, since they're private... Maybe achievements?
         if emails
diff --git a/app/views/AboutView.coffee b/app/views/AboutView.coffee
index 00c58a2d3..d8ce5cf41 100644
--- a/app/views/AboutView.coffee
+++ b/app/views/AboutView.coffee
@@ -4,3 +4,5 @@ template = require 'templates/about'
 module.exports = class AboutView extends RootView
   id: 'about-view'
   template: template
+
+  logoutRedirectURL: false
\ No newline at end of file
diff --git a/app/views/CommunityView.coffee b/app/views/CommunityView.coffee
index 0186ede61..150dd126d 100644
--- a/app/views/CommunityView.coffee
+++ b/app/views/CommunityView.coffee
@@ -17,3 +17,5 @@ module.exports = class CommunityView extends RootView
 
     @$el.find('.logo-row img').each ->
       $(@).popover(placement: 'top', trigger: 'hover', container: 'body')
+
+  logoutRedirectURL: false
diff --git a/app/views/EmployersView.coffee b/app/views/EmployersView.coffee
deleted file mode 100644
index bbb596d3a..000000000
--- a/app/views/EmployersView.coffee
+++ /dev/null
@@ -1,352 +0,0 @@
-RootView = require 'views/core/RootView'
-template = require 'templates/employers'
-User = require 'models/User'
-{me} = require 'core/auth'
-CocoCollection = require 'collections/CocoCollection'
-EmployerSignupModal = require 'views/modal/EmployerSignupModal'
-
-class CandidatesCollection extends CocoCollection
-  url: '/db/user/x/candidates'
-  model: User
-
-module.exports = class EmployersView extends RootView
-  id: 'employers-view'
-  template: template
-
-  events:
-    'click #candidate-table': 'onCandidateClicked'
-    'click #logout-link': 'logoutAccount'
-    'change #filters input': 'onFilterChanged'
-    'change #select_all_checkbox': 'handleSelectAllChange'
-    'click .get-started-button': 'openSignupModal'
-    'click .navbar-brand': 'restoreBodyColor'
-    'click #login-link': 'onClickAuthButton'
-    'click #filter-link': 'swapFolderIcon'
-    'click #create-alert-button': 'createFilterAlert'
-    'click .deletion-col': 'deleteFilterAlert'
-
-  constructor: (options) ->
-    super options
-    return
-    @candidates = @supermodel.loadCollection(new CandidatesCollection(), 'candidates').model
-    @setFilterDefaults()
-
-  onLoaded: ->
-    super()
-    return
-    @setUpScrolling()
-
-  afterRender: ->
-    super()
-    return
-    @sortTable() if @candidates.models.length
-    @renderSavedFilters()
-
-  afterInsert: ->
-    super()
-    return
-    _.delay @checkForEmployerSignupHash, 500
-    #fairly hacky, change this in the future
-    @originalBackgroundColor = $('body').css 'background-color'
-    $('body').css 'background-color', '#B4B4B4'
-
-  restoreBodyColor: ->
-    $('body').css 'background-color', @originalBackgroundColor
-
-  swapFolderIcon: ->
-    $('#folder-icon').toggleClass('glyphicon-folder-close').toggleClass('glyphicon-folder-open')
-
-  onFilterChanged: ->
-    @resetFilters()
-    that = @
-    $('#filters :input').each ->
-      input = $(this)
-      checked = input.prop 'checked'
-      name = input.attr 'name'
-      value = input.val()
-      if name is 'phoneScreenFilter'
-        value = JSON.parse(input.prop 'value')
-      if checked
-        that.filters[name] = _.union that.filters[name], [value]
-      else
-        that.filters[name] = _.difference that.filters[name], [value]
-
-    for filterName, filterValues of @filters
-      if filterValues.length is 0
-        @filters[filterName] = @defaultFilters[filterName]
-    @applyFilters()
-
-  openSignupModal: ->
-    @openModalView new EmployerSignupModal
-
-  handleSelectAllChange: (e) ->
-    checkedState = e.currentTarget.checked
-    $('#filters :input').each ->
-      $(this).prop 'checked', checkedState
-    @onFilterChanged()
-
-  resetFilters: ->
-    for filterName, filterValues of @filters
-      @filters[filterName] = []
-
-  applyFilters: ->
-    candidateList = _.sortBy @candidates.models, (c) -> c.get('jobProfile').updated
-    candidateList = _.filter candidateList, (c) -> c.get('jobProfileApproved')
-
-    filteredCandidates = candidateList
-    for filterName, filterValues of @filters
-      if filterName is 'visa'
-        filteredCandidates = _.difference filteredCandidates, _.filter(filteredCandidates, (c) ->
-          fieldValue = c.get('jobProfile').visa
-          return not (_.contains filterValues, fieldValue)
-        )
-      else
-        filteredCandidates = _.difference filteredCandidates, _.filter(filteredCandidates, (c) ->
-          unless c.get('jobProfile').curated then return true
-          fieldValue = c.get('jobProfile').curated?[filterName]
-          return not (_.contains filterValues, fieldValue)
-        )
-    candidateIDsToShow = _.pluck filteredCandidates, 'id'
-    $('#candidate-table tr').each -> $(this).hide()
-    candidateIDsToShow.forEach (id) ->
-      $("[data-candidate-id=#{id}]").show()
-    $('#results').text(candidateIDsToShow.length + ' results')
-
-
-    return filteredCandidates
-
-  setFilterDefaults: ->
-    @filters =
-      phoneScreenFilter: [true, false]
-      visa: ['Authorized to work in the US', 'Need visa sponsorship']
-      schoolFilter: ['Top School', 'Other']
-      locationFilter: ['Bay Area', 'New York', 'Other US', 'International']
-      roleFilter: ['Web Developer', 'Software Developer', 'Mobile Developer']
-      seniorityFilter: ['College Student', 'Recent Grad', 'Junior', 'Senior']
-    @defaultFilters = _.cloneDeep @filters
-
-  candidatesInFilter: (filterName, filterValue) =>
-    candidates = @getActiveAndApprovedCandidates()
-    if filterName and filterValue
-      if filterName is 'visa'
-        return (_.filter candidates, (c) -> c.get('jobProfile').visa is filterValue).length
-      else
-        return (_.filter candidates, (c) -> c.get('jobProfile').curated?[filterName] is filterValue).length
-    else
-      return Math.floor(Math.random() * 500)
-
-  createFilterAlert: ->
-    currentFilterSet = _.cloneDeep @filters
-    currentSavedFilters = _.cloneDeep me.get('savedEmployerFilterAlerts') ? []
-    currentSavedFilters.push currentFilterSet
-    @patchEmployerFilterAlerts currentSavedFilters, @renderSavedFilters
-
-  deleteFilterAlert: (e) ->
-    index = $(e.target).closest('tbody tr').data('filter-index')
-    currentSavedFilters = me.get('savedEmployerFilterAlerts')
-    currentSavedFilters.splice(index,1)
-    @patchEmployerFilterAlerts currentSavedFilters, @renderSavedFilters
-
-  patchEmployerFilterAlerts: (newFilters, cb) ->
-    me.set('savedEmployerFilterAlerts',newFilters)
-    unless me.isValid()
-      alert("There was an error setting the filter(me.isValid() returned false.) Reverting! Please notify team@codecombat.com.")
-      me.set 'savedEmployerFilterAlerts', me.previous('savedEmployerFilterAlerts')
-    else
-      triggerErrorAlert = -> alert("There was an error saving your filter alert! Please notify team@codecombat.com.")
-      res = me.save {"savedEmployerFilterAlerts": newFilters}, {patch: true, type: 'PUT', success: cb, error: triggerErrorAlert}
-
-  renderSavedFilters: =>
-    savedFilters = me.get('savedEmployerFilterAlerts')
-    unless savedFilters?.length then return $("#saved-filter-table").hide()
-    $("#saved-filter-table").show()
-    $("#saved-filter-table").find("tbody tr").remove()
-    for filter, index in savedFilters
-      $("#saved-filter-table tbody").append("""<tr data-filter-index="#{index}"><td>#{@generateFilterAlertDescription(filter)}</td><td class="deletion-col"><a>✗</a></td></tr> """)
-
-  generateFilterAlertDescription: (filter) =>
-    descriptionString = ""
-    for key in _.keys(filter).sort()
-      value = filter[key]
-      if key is "filterActive" or _.without(@defaultFilters[key],value...).length is 0 then continue
-      if descriptionString.length then descriptionString += ", "
-      descriptionString += value.join(", ")
-    if descriptionString.length is 0 then descriptionString = "Any new candidate"
-    return descriptionString
-
-  getActiveAndApprovedCandidates: =>
-    candidates = _.filter @candidates.models, (c) -> c.get('jobProfile').active
-    return _.filter candidates, (c) -> c.get('jobProfileApproved')
-
-  getRenderData: ->
-    ctx = super()
-    return ctx
-    ctx.isEmployer = @isEmployer()
-    #If you change the candidates displayed, change candidatesInFilter()
-    ctx.candidates = _.sortBy @candidates.models, (c) -> -1 * c.get('jobProfile').experience
-    ctx.candidates = _.sortBy ctx.candidates, (c) -> not c.get('jobProfile').curated?
-    ctx.candidates = _.sortBy ctx.candidates, (c) -> c.get('jobProfile').curated?.featured
-    ctx.activeCandidates = _.filter ctx.candidates, (c) -> c.get('jobProfile').active
-    ctx.inactiveCandidates = _.reject ctx.candidates, (c) -> c.get('jobProfile').active
-    ctx.featuredCandidates = _.filter ctx.activeCandidates, (c) -> c.get('jobProfileApproved')
-
-    unless @isEmployer() or me.isAdmin()
-      ctx.featuredCandidates = _.filter ctx.featuredCandidates, (c) -> c.get('jobProfile').curated
-      ctx.featuredCandidates = ctx.featuredCandidates.slice(0,7)
-    if me.isAdmin()
-      ctx.featuredCandidates = ctx.candidates
-    ctx.candidatesInFilter = @candidatesInFilter
-    ctx.otherCandidates = _.reject ctx.activeCandidates, (c) -> c.get('jobProfileApproved')
-    ctx.moment = moment
-    ctx._ = _
-    ctx.numberOfCandidates = ctx.featuredCandidates.length
-    ctx
-
-  isEmployer: -> 'employer' in me.get('permissions', true)
-
-  setUpScrolling: =>
-    $('.nano').nanoScroller()
-    #if window.history?.state?.lastViewedCandidateID
-    #  $('.nano').nanoScroller({scrollTo: $('#' + window.history.state.lastViewedCandidateID)})
-    #else if window.location.hash.length is 25
-    #  $('.nano').nanoScroller({scrollTo: $(window.location.hash)})
-
-  checkForEmployerSignupHash: =>
-    if window.location.hash is '#employerSignupLoggingIn' and not ('employer' in me.get('permissions', true)) and not me.isAdmin()
-      @openModalView new EmployerSignupModal
-      window.location.hash = ''
-
-  sortTable: ->
-    # http://mottie.github.io/tablesorter/docs/example-widget-bootstrap-theme.html
-    $.extend $.tablesorter.themes.bootstrap,
-      # these classes are added to the table. To see other table classes available,
-      # look here: http://twitter.github.com/bootstrap/base-css.html#tables
-      table: 'table table-bordered'
-      caption: 'caption'
-      header: 'bootstrap-header' # give the header a gradient background
-      footerRow: ''
-      footerCells: ''
-      icons: '' # add 'icon-white' to make them white; this icon class is added to the <i> in the header
-      sortNone: 'bootstrap-icon-unsorted'
-      sortAsc: 'icon-chevron-up'  # glyphicon glyphicon-chevron-up' # we are still using v2 icons
-      sortDesc: 'icon-chevron-down'  # glyphicon-chevron-down' # we are still using v2 icons
-      active: '' # applied when column is sorted
-      hover: '' # use custom css here - bootstrap class may not override it
-      filterRow: '' # filter row class
-      even: '' # odd row zebra striping
-      odd: '' # even row zebra striping
-
-    # e = exact text from cell
-    # n = normalized value returned by the column parser
-    # f = search filter input value
-    # i = column index
-    # $r = ???
-    filterSelectExactMatch = (e, n, f, i, $r) -> e is f
-
-    # call the tablesorter plugin and apply the uitheme widget
-    @$el.find('.tablesorter').tablesorter
-      theme: 'bootstrap'
-      widthFixed: true
-      headerTemplate: '{content} {icon}'
-      textSorter:
-        6: (a, b, direction, column, table) ->
-          days = []
-          for s in [a, b]
-            n = parseInt s
-            n = 0 unless _.isNumber n
-            n = 1 if /^a/.test s
-            for [duration, factor] in [
-              [/second/i, 1/(86400*1000)]
-              [/minute/i, 1/1440]
-              [/hour/i, 1/24]
-              [/week/i, 7]
-              [/month/i, 30.42]
-              [/year/i, 365.2425]
-            ]
-              if duration.test s
-                n *= factor
-                break
-            if /^in /i.test s
-              n *= -1
-            days.push n
-          days[0] - days[1]
-      sortList: if @isEmployer() or me.isAdmin() then [[6, 0]] else [[0, 1]]
-      # widget code contained in the jquery.tablesorter.widgets.js file
-      # use the zebra stripe widget if you plan on hiding any rows (filter widget)
-      widgets: ['uitheme', 'zebra', 'filter']
-      widgetOptions:
-        # using the default zebra striping class name, so it actually isn't included in the theme variable above
-        # this is ONLY needed for bootstrap theming if you are using the filter widget, because rows are hidden
-        zebra: ['even', 'odd']
-
-        # extra css class applied to the table row containing the filters & the inputs within that row
-        filter_cssFilter: ''
-
-        # If there are child rows in the table (rows with class name from 'cssChildRow' option)
-        # and this option is true and a match is found anywhere in the child row, then it will make that row
-        # visible; default is false
-        filter_childRows: false
-
-        # if true, filters are collapsed initially, but can be revealed by hovering over the grey bar immediately
-        # below the header row. Additionally, tabbing through the document will open the filter row when an input gets focus
-        filter_hideFilters: false
-
-        # Set this option to false to make the searches case sensitive
-        filter_ignoreCase: true
-
-        # jQuery selector string of an element used to reset the filters
-        filter_reset: '.reset'
-
-        # Use the $.tablesorter.storage utility to save the most recent filters
-        filter_saveFilters: true
-
-        # Delay in milliseconds before the filter widget starts searching; This option prevents searching for
-        # every character while typing and should make searching large tables faster.
-        filter_searchDelay: 150
-
-        # Set this option to true to use the filter to find text from the start of the column
-        # So typing in 'a' will find 'albert' but not 'frank', both have a's; default is false
-        filter_startsWith: false
-
-        filter_functions:
-          2:
-            'Full-time': filterSelectExactMatch
-            'Part-time': filterSelectExactMatch
-            'Contracting': filterSelectExactMatch
-            'Remote': filterSelectExactMatch
-            'Internship': filterSelectExactMatch
-          5:
-            '0-1': (e, n, f, i, $r) -> n <= 1
-            '2-5': (e, n, f, i, $r) -> 2 <= n <= 5
-            '6+': (e, n, f, i, $r) -> 6 <= n
-          6:
-            'Last day': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 1
-            'Last week': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 7
-            'Last 4 weeks': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 28
-          8:
-            '✓': filterSelectExactMatch
-            '✗': filterSelectExactMatch
-
-  logoutAccount: ->
-    window.location.hash = ''
-    super()
-
-  onCandidateClicked: (e) ->
-    id = $(e.target).closest('tr').data('candidate-id')
-    if id and (@isEmployer() or me.isAdmin())
-      if window.history
-        oldState = _.cloneDeep window.history.state ? {}
-        oldState['lastViewedCandidateID'] = id
-        window.history.replaceState(oldState, '')
-      else
-        window.location.hash = id
-      url = "/account/profile/#{id}"
-      window.open url, '_blank'
-    else
-      @openModalView new EmployerSignupModal
diff --git a/app/views/HomeView.coffee b/app/views/HomeView.coffee
index 377202c93..a27d89c10 100644
--- a/app/views/HomeView.coffee
+++ b/app/views/HomeView.coffee
@@ -14,7 +14,7 @@ module.exports = class HomeView extends RootView
     if @getQueryVariable 'hour_of_code'
       application.router.navigate "/hoc", trigger: true
 
-    isHourOfCodeWeek = true  # Temporary: default to /hoc flow during the main event week
+    isHourOfCodeWeek = false  # Temporary: default to /hoc flow during the main event week
     if isHourOfCodeWeek and (@isNewPlayer() or (@justPlaysCourses() and me.isAnonymous()))
       # Go/return straight to playing single-player HoC course on Play click
       @playURL = '/hoc?go=true'
diff --git a/app/views/LegalView.coffee b/app/views/LegalView.coffee
index 0a4f6a80e..544ce3e8b 100644
--- a/app/views/LegalView.coffee
+++ b/app/views/LegalView.coffee
@@ -1,6 +1,20 @@
 RootView = require 'views/core/RootView'
 template = require 'templates/legal'
+Products = require 'collections/Products'
 
 module.exports = class LegalView extends RootView
   id: 'legal-view'
   template: template
+
+  initialize: ->
+    @products = new Products()
+    @supermodel.loadCollection(@products, 'products')
+
+  afterRender: ->
+    super()
+    basicSub = @products.findWhere({name: 'basic_subscription'})
+    return unless basicSub
+    text = $.i18n.t('legal.cost_description')
+    text = text.replace('{{price}}', (basicSub.get('amount') / 100).toFixed(2))
+    text = text.replace('{{gems}}', basicSub.get('gems'))
+    @$('#cost-description').text(text)
diff --git a/app/views/SalesView.coffee b/app/views/SalesView.coffee
new file mode 100644
index 000000000..ad24217fd
--- /dev/null
+++ b/app/views/SalesView.coffee
@@ -0,0 +1,36 @@
+app = require 'core/application'
+AuthModal = require 'views/core/AuthModal'
+RootView = require 'views/core/RootView'
+template = require 'templates/sales-view'
+
+module.exports = class SalesView extends RootView
+  id: 'sales-view'
+  template: template
+
+  events:
+    'click .btn-contact-us': 'onClickContactUs'
+    'click .btn-create-account': 'onClickSignup'
+    'click .btn-login-account': 'onClickLogin'
+    'click #down-arrow': 'onClickDownArrow'
+
+  getTitle: ->
+    'CodeCombat'
+
+  onClickContactUs: (e) ->
+    app.router.navigate '/teachers/freetrial', trigger: true
+
+  onClickLogin: (e) ->
+    @openModalView new AuthModal(mode: 'login') if me.get('anonymous')
+    window.tracker?.trackEvent 'Started Login', category: 'Sales', label: 'Sales Login'
+
+  onClickSignup: (e) ->
+    @openModalView new AuthModal() if me.get('anonymous')
+    window.tracker?.trackEvent 'Started Signup', category: 'Sales', label: 'Sales Create'
+
+  logoutRedirectURL: false
+
+  onClickDownArrow: (e) ->
+    $('#page-container').animate({
+      scrollTop: $('[name="' + $(e.target).closest('a').attr('href').substr(1) + '"]').offset().top
+    }, 300)
+    false
diff --git a/app/views/TeachersFreeTrialView.coffee b/app/views/TeachersFreeTrialView.coffee
index 9e386e536..44d15cfc4 100644
--- a/app/views/TeachersFreeTrialView.coffee
+++ b/app/views/TeachersFreeTrialView.coffee
@@ -8,6 +8,7 @@ TrialRequest = require 'models/TrialRequest'
 module.exports = class TeachersFreeTrialView extends RootView
   id: 'teachers-free-trial-view'
   template: template
+  logoutRedirectURL: false
 
   events:
     'click .submit-button': 'onClickSubmit'
diff --git a/app/views/TeachersView.coffee b/app/views/TeachersView.coffee
index 121bd6c37..cd71b53c9 100644
--- a/app/views/TeachersView.coffee
+++ b/app/views/TeachersView.coffee
@@ -13,6 +13,10 @@ module.exports = class TeachersView extends RootView
 
   constructor: ->
     super()
+    if me.isAnonymous()
+      _.defer ->
+        # Just go to /schools for now, that page is better than this one. TODO: figure out real URLs/flow/content.
+        application.router.navigate "/schools", trigger: true
     unless me.isAnonymous()
       _.defer ->
         application.router.navigate "/courses/teachers", trigger: true
@@ -24,3 +28,5 @@ module.exports = class TeachersView extends RootView
   onClickSignup: (e) ->
     @openModalView new AuthModal() if me.get('anonymous')
     window.tracker?.trackEvent 'Started Signup', category: 'Teachers', label: 'Teachers Create'
+
+  logoutRedirectURL: false
diff --git a/app/views/account/JobProfileTreemaView.coffee b/app/views/account/JobProfileTreemaView.coffee
deleted file mode 100644
index 3e7d13153..000000000
--- a/app/views/account/JobProfileTreemaView.coffee
+++ /dev/null
@@ -1,136 +0,0 @@
-CocoView = require 'views/core/CocoView'
-template = require 'templates/account/job-profile-treema-view'
-{me} = require 'core/auth'
-require 'vendor/treema'
-
-module.exports = class JobProfileTreemaView extends CocoView
-  id: 'job-profile-view'
-  template: template
-
-  editableSettings: [
-    'lookingFor', 'active', 'name', 'city', 'country', 'skills', 'experience', 'shortDescription', 'longDescription',
-    'work', 'education', 'visa', 'projects', 'links', 'jobTitle', 'photoURL'
-  ]
-  readOnlySettings: []  #['updated']
-
-  afterRender: ->
-    super()
-    return unless @supermodel.finished()
-    _.defer => @buildJobProfileTreema()  # Not sure why, but the Treemas don't fully build without this if you reload the page.
-
-  buildJobProfileTreema: ->
-    visibleSettings = @editableSettings.concat @readOnlySettings
-    data = _.pick (me.get('jobProfile') ? {}), (value, key) -> key in visibleSettings
-    data.name ?= (me.get('firstName') + ' ' + me.get('lastName')).trim() if me.get('firstName')
-    schema = _.cloneDeep me.schema().properties.jobProfile
-    schema.properties = _.pick schema.properties, (value, key) -> key in visibleSettings
-    schema.required = _.intersection schema.required, visibleSettings
-    for prop in @readOnlySettings
-      schema.properties[prop].readOnly = true
-    treemaOptions =
-      filePath: "db/user/#{me.id}"
-      schema: schema
-      data: data
-      aceUseWrapMode: true
-      callbacks: {change: @onJobProfileChanged}
-      nodeClasses:
-        'skill': SkillTagNode
-        'link-name': LinkNameNode
-        'city': CityNode
-        'country': CountryNode
-
-    @jobProfileTreema = @$el.find('#job-profile-treema').treema treemaOptions
-    @jobProfileTreema.build()
-    @jobProfileTreema.open()
-    @updateProgress()
-
-  onJobProfileChanged: (e) =>
-    @hasEditedProfile = true
-    @trigger 'change'
-    @updateProgress()
-
-  updateProgress: ->
-    completed = 0
-    totalWeight = 0
-    next = null
-    for metric in metrics = @getProgressMetrics()
-      done = metric.fn()
-      completed += metric.weight if done
-      totalWeight += metric.weight
-      next = metric.name unless next or done
-    progress = Math.round 100 * completed / totalWeight
-    bar = @$el.find('.profile-completion-progress .progress-bar')
-    bar.css 'width', "#{progress}%"
-    text = ''
-    if progress > 19
-      text = "#{progress}% complete"
-    else if progress > 5
-      text = "#{progress}%"
-    bar.text text
-    bar.parent().toggle Boolean progress
-    @$el.find('.progress-next-item').text(next).toggle Boolean next
-
-  getProgressMetrics: ->
-    return @progressMetrics if @progressMetrics
-    schema = me.schema().properties.jobProfile
-    jobProfile = @jobProfileTreema.data
-    exists = (field) -> -> jobProfile[field]
-    modified = (field) -> -> jobProfile[field] and jobProfile[field] isnt schema.properties[field].default
-    listStarted = (field, subfields) -> -> jobProfile[field]?.length and _.every subfields, (subfield) -> jobProfile[field][0][subfield]
-    @progressMetrics = [
-      {name: 'Mark yourself open to offers to show up in searches.', weight: 1, fn: modified 'active'}
-      {name: 'Specify your desired job title.', weight: 0, fn: exists 'jobTitle'}
-      {name: 'Provide your name.', weight: 1, fn: modified 'name'}
-      {name: 'Choose your city.', weight: 1, fn: modified 'city'}
-      {name: 'Pick your country.', weight: 0, fn: exists 'country'}
-      {name: 'List at least five skills.', weight: 2, fn: -> jobProfile.skills?.length >= 5}
-      {name: 'Write a short description to summarize yourself at a glance.', weight: 2, fn: modified 'shortDescription'}
-      {name: 'Fill in your main description to sell yourself and describe the work you\'re looking for.', weight: 3, fn: modified 'longDescription'}
-      {name: 'List your work experience.', weight: 3, fn: listStarted 'work', ['role', 'employer']}
-      {name: 'Recount your educational ordeals.', weight: 3, fn: listStarted 'education', ['degree', 'school']}
-      {name: 'Show off up to three projects you\'ve worked on.', weight: 3, fn: listStarted 'projects', ['name']}
-      {name: 'Add any personal or social links.', weight: 2, fn: listStarted 'links', ['link', 'name']}
-      {name: 'Add an optional professional photo.', weight: 2, fn: modified 'photoURL'}
-    ]
-
-  getData: ->
-    return {} unless me.get('jobProfile') or @hasEditedProfile
-    _.pick @jobProfileTreema.data, (value, key) => key in @editableSettings
-
-  destroy: ->
-    @jobProfileTreema?.destroy()
-    super()
-
-JobProfileTreemaView.commonSkills = commonSkills = ['c#', 'java', 'javascript', 'php', 'android', 'jquery', 'python', 'c++', 'html', 'mysql', 'ios', 'asp.net', 'css', 'sql', 'iphone', '.net', 'objective-c', 'ruby-on-rails', 'c', 'ruby', 'sql-server', 'ajax', 'wpf', 'linux', 'database', 'django', 'vb.net', 'windows', 'facebook', 'r', 'html5', 'multithreading', 'ruby-on-rails-3', 'wordpress', 'winforms', 'node.js', 'spring', 'osx', 'performance', 'visual-studio-2010', 'oracle', 'swing', 'algorithm', 'git', 'linq', 'apache', 'web-services', 'perl', 'wcf', 'entity-framework', 'bash', 'visual-studio', 'sql-server-2008', 'hibernate', 'actionscript-3', 'angularjs', 'matlab', 'qt', 'ipad', 'sqlite', 'cocoa-touch', 'cocoa', 'flash', 'mongodb', 'codeigniter', 'jquery-ui', 'css3', 'tsql', 'google-maps', 'silverlight', 'security', 'delphi', 'vba', 'postgresql', 'jsp', 'shell', 'internet-explorer', 'google-app-engine', 'sockets', 'validation', 'scala', 'oop', 'unit-testing', 'xaml', 'parsing', 'twitter-bootstrap', 'google-chrome', 'http', 'magento', 'email', 'android-layout', 'flex', 'rest', 'maven', 'jsf', 'listview', 'date', 'winapi', 'windows-phone-7', 'facebook-graph-api', 'unix', 'url', 'c#-4.0', 'jquery-ajax', 'svn', 'symfony2', 'table', 'cakephp', 'firefox', 'ms-access', 'java-ee', 'jquery-mobile', 'python-2.7', 'tomcat', 'zend-framework', 'opencv', 'visual-c++', 'opengl', 'spring-mvc', 'sql-server-2005', 'authentication', 'search', 'xslt', 'servlets', 'pdf', 'animation', 'math', 'batch-file', 'excel-vba', 'iis', 'mod-rewrite', 'sharepoint', 'gwt', 'powershell', 'visual-studio-2012', 'haskell', 'grails', 'ubuntu', 'networking', 'nhibernate', 'design-patterns', 'testing', 'jpa', 'visual-studio-2008', 'core-data', 'user-interface', 'audio', 'backbone.js', 'gcc', 'mobile', 'design', 'activerecord', 'extjs', 'video', 'stored-procedures', 'optimization', 'drupal', 'image-processing', 'android-intent', 'logging', 'web-applications', 'razor', 'database-design', 'azure', 'vim', 'memory-management', 'model-view-controller', 'cordova', 'c++11', 'selenium', 'ssl', 'assembly', 'soap', 'boost', 'canvas', 'google-maps-api-3', 'netbeans', 'heroku', 'jsf-2', 'encryption', 'hadoop', 'linq-to-sql', 'dll', 'xpath', 'data-binding', 'windows-phone-8', 'phonegap', 'jdbc', 'python-3.x', 'twitter', 'mvvm', 'gui', 'web', 'jquery-plugins', 'numpy', 'deployment', 'ios7', 'emacs', 'knockout.js', 'graphics', 'joomla', 'unicode', 'windows-8', 'android-fragments', 'ant', 'command-line', 'version-control', 'yii', 'github', 'amazon-web-services', 'macros', 'ember.js', 'svg', 'opengl-es', 'django-models', 'solr', 'orm', 'blackberry', 'windows-7', 'ruby-on-rails-4', 'compiler', 'tcp', 'pdo', 'architecture', 'groovy', 'nginx', 'concurrency', 'paypal', 'iis-7', 'express', 'vbscript', 'google-chrome-extension', 'memory-leaks', 'rspec', 'actionscript', 'interface', 'fonts', 'oauth', 'ssh', 'tfs', 'junit', 'struts2', 'd3.js', 'coldfusion', '.net-4.0', 'jqgrid', 'asp-classic', 'https', 'plsql', 'stl', 'sharepoint-2010', 'asp.net-web-api', 'mysqli', 'sed', 'awk', 'internet-explorer-8', 'jboss', 'charts', 'scripting', 'matplotlib', 'laravel', 'clojure', 'entity-framework-4', 'intellij-idea', 'xml-parsing', 'sqlite3', '3d', 'io', 'mfc', 'devise', 'playframework', 'youtube', 'amazon-ec2', 'localization', 'cuda', 'jenkins', 'ssis', 'safari', 'doctrine2', 'vb6', 'amazon-s3', 'dojo', 'air', 'eclipse-plugin', 'android-asynctask', 'crystal-reports', 'cocos2d-iphone', 'dns', 'highcharts', 'ruby-on-rails-3.2', 'ado.net', 'sql-server-2008-r2', 'android-emulator', 'spring-security', 'cross-browser', 'oracle11g', 'bluetooth', 'f#', 'msbuild', 'drupal-7', 'google-apps-script', 'mercurial', 'xna', 'google-analytics', 'lua', 'parallel-processing', 'internationalization', 'java-me', 'mono', 'monotouch', 'android-ndk', 'lucene', 'kendo-ui', 'linux-kernel', 'terminal', 'phpmyadmin', 'makefile', 'ffmpeg', 'applet', 'active-directory', 'coffeescript', 'pandas', 'responsive-design', 'xhtml', 'silverlight-4.0', '.net-3.5', 'jaxb', 'ruby-on-rails-3.1', 'gps', 'geolocation', 'network-programming', 'windows-services', 'laravel-4', 'ggplot2', 'rss', 'webkit', 'functional-programming', 'wsdl', 'telerik', 'maven-2', 'cron', 'mapreduce', 'websocket', 'automation', 'windows-runtime', 'django-forms', 'tkinter', 'android-widget', 'android-activity', 'rubygems', 'content-management-system', 'doctrine', 'django-templates', 'gem', 'fluent-nhibernate', 'seo', 'meteor', 'serial-port', 'glassfish', 'documentation', 'cryptography', 'ef-code-first', 'extjs4', 'x86', 'wordpress-plugin', 'go', 'wix', 'linq-to-entities', 'oracle10g', 'cocos2d', 'selenium-webdriver', 'open-source', 'jtable', 'qt4', 'smtp', 'redis', 'jvm', 'openssl', 'timezone', 'nosql', 'erlang', 'playframework-2.0', 'machine-learning', 'mocking', 'unity3d', 'thread-safety', 'android-actionbar', 'jni', 'udp', 'jasper-reports', 'zend-framework2', 'apache2', 'internet-explorer-7', 'sqlalchemy', 'neo4j', 'ldap', 'jframe', 'youtube-api', 'filesystems', 'make', 'flask', 'gdb', 'cassandra', 'sms', 'g++', 'django-admin', 'push-notification', 'statistics', 'tinymce', 'locking', 'javafx', 'firefox-addon', 'fancybox', 'windows-phone', 'log4j', 'uikit', 'prolog', 'socket.io', 'icons', 'oauth-2.0', 'refactoring', 'sencha-touch', 'elasticsearch', 'symfony1', 'google-api', 'webserver', 'wpf-controls', 'microsoft-metro', 'gtk', 'flex4', 'three.js', 'gradle', 'centos', 'angularjs-directive', 'internet-explorer-9', 'sass', 'html5-canvas', 'interface-builder', 'programming-languages', 'gmail', 'jersey', 'twitter-bootstrap-3', 'arduino', 'requirejs', 'cmake', 'web-development', 'software-engineering', 'startups', 'entrepreneurship', 'social-media-marketing', 'writing', 'marketing', 'web-design', 'graphic-design', 'game-development', 'game-design', 'photoshop', 'illustrator', 'robotics', 'aws', 'devops', 'mathematica', 'bioinformatics', 'data-vis', 'ui', 'embedded-systems', 'codecombat']
-
-JobProfileTreemaView.commonLinkNames = commonLinkNames = ['GitHub', 'Facebook', 'Twitter', 'G+', 'LinkedIn', 'Personal Website', 'Blog']
-
-JobProfileTreemaView.commonCountries = commonCountries = ['Afghanistan', 'Albania', 'Algeria', 'American Samoa', 'Andorra', 'Angola', 'Anguilla', 'Antarctica', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Australia', 'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda', 'Bhutan', 'Bolivia', 'Bosnia and Herzegovina', 'Botswana', 'Brazil', 'Brunei Darussalam', 'Bulgaria', 'Burkina Faso', 'Burundi', 'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile', 'China', 'Christmas Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Democratic Republic of the Congo (Kinshasa)', 'Congo, Republic of (Brazzaville)', 'Cook Islands', 'Costa Rica', 'Ivory Coast', 'Croatia', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic', 'East Timor', 'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands', 'Faroe Islands', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern Territories', 'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Great Britain', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe', 'Guam', 'Guatemala', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Holy See', 'Honduras', 'Hong Kong', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jordan', 'Kazakhstan', 'Kenya', 'Kiribati', 'North Korea', 'South Korea', 'Kosovo', 'Kuwait', 'Kyrgyzstan', 'Lao, People\'s Democratic Republic', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macau', 'Macedonia, Rep. of', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius', 'Mayotte', 'Mexico', 'Micronesia, Federal States of', 'Moldova, Republic of', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco', 'Mozambique', 'Myanmar, Burma', 'Namibia', 'Nauru', 'Nepal', 'Netherlands', 'Netherlands Antilles', 'New Caledonia', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'Niue', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau', 'Palestinian territories', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Philippines', 'Pitcairn Island', 'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion Island', 'Romania', 'Russian Federation', 'Rwanda', 'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Vincent and the Grenadines', 'Samoa', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Islands', 'Somalia', 'South Africa', 'South Sudan', 'Spain', 'Sri Lanka', 'Sudan', 'Suriname', 'Swaziland', 'Sweden', 'Switzerland', 'Syria, Syrian Arab Republic', 'Taiwan', 'Tajikistan', 'Tanzania; officially the United Republic of Tanzania', 'Thailand', 'Tibet', 'Timor-Leste', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kingdom', 'USA', 'Uruguay', 'Uzbekistan', 'Vanuatu', 'Vatican City State', 'Venezuela', 'Vietnam', 'Virgin Islands (British)', 'Virgin Islands (U.S.)', 'Wallis and Futuna Islands', 'Western Sahara', 'Yemen', 'Zambia', 'Zimbabwe']
-
-JobProfileTreemaView.commonCities = commonCities = ['Tokyo', 'Jakarta', 'Seoul', 'Delhi', 'Shanghai', 'Manila', 'Karachi', 'New York', 'Sao Paulo', 'Mexico City', 'Cairo', 'Beijing', 'Osaka', 'Mumbai (Bombay)', 'Guangzhou', 'Moscow', 'Los Angeles', 'Calcutta', 'Dhaka', 'Buenos Aires', 'Istanbul', 'Rio de Janeiro', 'Shenzhen', 'Lagos', 'Paris', 'Nagoya', 'Lima', 'Chicago', 'Kinshasa', 'Tianjin', 'Chennai', 'Bogota', 'Bengaluru', 'London', 'Taipei', 'Ho Chi Minh City (Saigon)', 'Dongguan', 'Hyderabad', 'Chengdu', 'Lahore', 'Johannesburg', 'Tehran', 'Essen', 'Bangkok', 'Hong Kong', 'Wuhan', 'Ahmedabad', 'Chongqung', 'Baghdad', 'Hangzhou', 'Toronto', 'Kuala Lumpur', 'Santiago', 'Dallas-Fort Worth', 'Quanzhou', 'Miami', 'Shenyang', 'Belo Horizonte', 'Philadelphia', 'Nanjing', 'Madrid', 'Houston', 'Xi\'an-Xianyang', 'Milan', 'Luanda', 'Pune', 'Singapore', 'Riyadh', 'Khartoum', 'Saint Petersburg', 'Atlanta', 'Surat', 'Washington', 'Bandung', 'Surabaya', 'Yangoon', 'Alexandria', 'Guadalajara', 'Harbin', 'Boston', 'Zhengzhou', 'Qingdao', 'Abidjan', 'Barcelona', 'Monterrey', 'Ankara', 'Suzhou', 'Phoenix-Mesa', 'Salvador', 'Porto Alegre', 'Rome', 'Accra', 'Sydney', 'Recife', 'Naples', 'Detroit', 'Dalian', 'Fuzhou', 'Medellin', 'San Francisco', 'Silicon Valley', 'Portland', 'Seattle', 'Austin', 'Denver', 'Boulder']
-
-autoFocus = true  # Not working right now, possibly a Treema bower thing.
-
-class SkillTagNode extends TreemaNode.nodeMap.string
-  buildValueForEditing: (valEl, data) ->
-    super(valEl, data)
-    valEl.find('input').autocomplete(source: commonSkills, minLength: 1, delay: 0, autoFocus: autoFocus)
-    valEl
-
-class LinkNameNode extends TreemaNode.nodeMap.string
-  buildValueForEditing: (valEl, data) ->
-    super(valEl, data)
-    valEl.find('input').autocomplete(source: commonLinkNames, minLength: 0, delay: 0, autoFocus: autoFocus)
-    valEl
-
-class CityNode extends TreemaNode.nodeMap.string
-  buildValueForEditing: (valEl, data) ->
-    super(valEl, data)
-    valEl.find('input').autocomplete(source: commonCities, minLength: 1, delay: 0, autoFocus: autoFocus)
-    valEl
-
-class CountryNode extends TreemaNode.nodeMap.string
-  buildValueForEditing: (valEl, data) ->
-    super(valEl, data)
-    valEl.find('input').autocomplete(source: commonCountries, minLength: 1, delay: 0, autoFocus: autoFocus)
-    valEl
diff --git a/app/views/account/PrepaidView.coffee b/app/views/account/PrepaidView.coffee
index 7a9e3a9b0..dcc503010 100644
--- a/app/views/account/PrepaidView.coffee
+++ b/app/views/account/PrepaidView.coffee
@@ -7,6 +7,7 @@ Prepaid = require '../../models/Prepaid'
 utils = require 'core/utils'
 RedeemModal = require 'views/account/PrepaidRedeemModal'
 forms = require 'core/forms'
+Products = require 'collections/Products'
 
 # TODO: remove redeem code modal
 
@@ -26,12 +27,10 @@ module.exports = class PrepaidView extends RootView
   subscriptions:
     'stripe:received-token': 'onStripeReceivedToken'
 
-  baseAmount: 9.99
-
   constructor: (options) ->
     super(options)
     @purchase =
-      total: @baseAmount
+      total: 0
       users: 3
       months: 3
     @updateTotal()
@@ -45,6 +44,14 @@ module.exports = class PrepaidView extends RootView
       @ppcQuery = true
       @loadPrepaid(@ppc)
 
+    @products = new Products()
+    @supermodel.loadCollection(@products, 'products')
+    
+  onLoaded: ->
+    @prepaidProduct = @products.findWhere { name: 'prepaid_subscription' }
+    @updateTotal()
+    super()
+
   getRenderData: ->
     c = super()
     c.purchase = @purchase
@@ -62,7 +69,8 @@ module.exports = class PrepaidView extends RootView
     noty text: message, layout: 'topCenter', type: type, killer: false, timeout: 5000, dismissQueue: true, maxVisible: 3
 
   updateTotal: ->
-    @purchase.total = getPrepaidCodeAmount(@baseAmount, @purchase.users, @purchase.months)
+    return unless @prepaidProduct
+    @purchase.total = getPrepaidCodeAmount(@prepaidProduct.get('amount'), @purchase.users, @purchase.months)
     @renderSelectors("#total", "#users-input", "#months-input")
 
   # Form Input Callbacks
@@ -99,7 +107,7 @@ module.exports = class PrepaidView extends RootView
   onClickPurchaseButton: (e) ->
     return unless $("#users-input").val() >= 3 or $("#months-input").val() >= 3
     @purchaseTimestamp = new Date().getTime()
-    @stripeAmount = @purchase.total * 100
+    @stripeAmount = @purchase.total
     @description = "Prepaid Code for " + @purchase.users + " users / " + @purchase.months + " months"
 
     stripeHandler.open
@@ -179,6 +187,7 @@ module.exports = class PrepaidView extends RootView
       # console.log 'SUCCESS: Prepaid purchase', model.code
       @statusMessage "Successfully purchased Prepaid Code!", "success"
       @codes.add(model)
+      @renderSelectors('#codes-panel')
 
     @statusMessage "Finalizing purchase...", "information"
     @supermodel.addRequestResource('purchase_prepaid', options, 0).load()
diff --git a/app/views/account/SubscriptionSaleView.coffee b/app/views/account/SubscriptionSaleView.coffee
deleted file mode 100644
index 442d1d1c5..000000000
--- a/app/views/account/SubscriptionSaleView.coffee
+++ /dev/null
@@ -1,92 +0,0 @@
-RootView = require 'views/core/RootView'
-template = require 'templates/account/subscription-sale-view'
-app = require 'core/application'
-AuthModal = require 'views/core/AuthModal'
-CocoCollection = require 'collections/CocoCollection'
-stripeHandler = require 'core/services/stripe'
-ThangType = require 'models/ThangType'
-utils = require 'core/utils'
-
-module.exports = class SubscriptionSaleView extends RootView
-  id: "subscription-sale-view"
-  template: template
-  yearSaleAmount: 9900
-  saleEndDate: new Date('2015-09-05')
-  onSale: false
-
-  events:
-    'click #pay-button': 'onPayButton'
-
-  subscriptions:
-    'stripe:received-token': 'onStripeReceivedToken'
-
-  constructor: (options) ->
-    super(options)
-    @description = $.i18n.t('subscribe.stripe_description_year_sale')
-    displayAmount = (@yearSaleAmount / 100).toFixed(2)
-    @payButtonText = "#{$.i18n.t('subscribe.sale_view_button')} $#{displayAmount}"
-    @heroes = new CocoCollection([], {model: ThangType})
-    @heroes.url = '/db/thang.type?view=heroes'
-    @heroes.setProjection ['original','name','heroClass','description', 'gems','extendedName','i18n']
-    @heroes.comparator = 'gems'
-    @listenToOnce @heroes, 'sync', @onHeroesLoaded
-    @supermodel.loadCollection(@heroes, 'heroes')
-
-  getRenderData: ->
-    c = super()
-    c.hasSubscription = me.get('stripe')?.sponsorID
-    c.heroes = @heroes.models
-    c.payButtonText = @payButtonText
-    c.saleEndDate = @saleEndDate
-    c.state = @state
-    c.stateMessage = @stateMessage
-    c
-
-  onHeroesLoaded: ->
-    @formatHero hero for hero in @heroes.models
-
-  formatHero: (hero) ->
-    hero.name = utils.i18n hero.attributes, 'extendedName'
-    hero.name ?= utils.i18n hero.attributes, 'name'
-    hero.description = utils.i18n hero.attributes, 'description'
-    hero.class = hero.get('heroClass') or 'Warrior'
-
-  onPayButton: ->
-    return @openModalView new AuthModal() if me.isAnonymous()
-    @state = undefined
-    @stateMessage = undefined
-    @render()
-
-    # Show Stripe handler
-    application.tracker?.trackEvent 'Started sale landing page subscription purchase'
-    @timestampForPurchase = new Date().getTime()
-    stripeHandler.open
-      amount: @yearSaleAmount
-      description: @description
-      bitcoin: true
-      alipay: if me.get('country') is 'china' or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
-
-  onStripeReceivedToken: (e) ->
-    @state = 'purchasing'
-    @render?()
-
-    # Call year sale API
-    data =
-      stripe:
-        token: e.token.id
-        timestamp: @timestampForPurchase
-    jqxhr = $.post('/db/subscription/-/year_sale', data)
-    jqxhr.done (data, textStatus, jqXHR) =>
-      application.tracker?.trackEvent 'Finished sale landing page subscription purchase', value: @yearSaleAmount
-      me.fetch(cache: false).always =>
-        app.router.navigate '/play', trigger: true
-    jqxhr.fail (xhr, textStatus, errorThrown) =>
-      console.error 'We got an error subscribing with Stripe from our server:', textStatus, errorThrown
-      application.tracker?.trackEvent 'Failed to finish 1 year subscription purchase', status: textStatus
-      if xhr.status is 402
-        @state = 'declined'
-        @stateMessage = arguments[2]
-      else
-        @state = 'unknown_error'
-        @stateMessage = "#{xhr.status}: #{xhr.responseText}"
-      @render?()
diff --git a/app/views/account/SubscriptionView.coffee b/app/views/account/SubscriptionView.coffee
index 41ace9c30..cc3367169 100644
--- a/app/views/account/SubscriptionView.coffee
+++ b/app/views/account/SubscriptionView.coffee
@@ -53,11 +53,6 @@ module.exports = class SubscriptionView extends RootView
     @personalSub.update => @render?()
     @recipientSubs.update => @render?()
 
-  getRenderData: ->
-    c = super()
-    c.emailValidator = @emailValidator
-    c
-
   # Personal Subscriptions
 
   onClickStartSubscription: (e) ->
diff --git a/app/views/admin/CandidatesView.coffee b/app/views/admin/CandidatesView.coffee
deleted file mode 100644
index c8a5380a6..000000000
--- a/app/views/admin/CandidatesView.coffee
+++ /dev/null
@@ -1,200 +0,0 @@
-RootView = require 'views/core/RootView'
-template = require 'templates/admin/candidates'
-User = require 'models/User'
-UserRemark = require 'models/UserRemark'
-{me} = require 'core/auth'
-CocoCollection = require 'collections/CocoCollection'
-EmployerSignupModal = require 'views/modal/EmployerSignupModal'
-
-class CandidatesCollection extends CocoCollection
-  url: '/db/user/x/candidates'
-  model: User
-
-class UserRemarksCollection extends CocoCollection
-  url: '/db/user.remark?project=contact,contactName,user'
-  model: UserRemark
-
-module.exports = class CandidatesView extends RootView
-  id: "admin-candidates-view"
-  template: template
-
-  events:
-    'click tbody tr': 'onCandidateClicked'
-
-  constructor: (options) ->
-    super options
-    #@candidates = @supermodel.loadCollection(new CandidatesCollection(), 'candidates').model
-    @candidates = models: []  # Disabling, since we got rid of the index that fetches these.
-    @remarks = @supermodel.loadCollection(new UserRemarksCollection(), 'user_remarks').model
-
-  onLoaded: ->
-    super()
-    @setUpScrolling()
-
-  afterRender: ->
-    super()
-    @sortTable() if @candidates.models.length
-
-  afterInsert: ->
-    super()
-    _.delay @checkForEmployerSignupHash, 500
-
-  getRenderData: ->
-    ctx = super()
-    ctx.isEmployer = @isEmployer()
-    ctx.candidates = _.sortBy @candidates.models, (c) -> c.get('jobProfile').updated
-    ctx.activeCandidates = _.filter ctx.candidates, (c) -> c.get('jobProfile').active
-    ctx.inactiveCandidates = _.reject ctx.candidates, (c) -> c.get('jobProfile').active
-    ctx.featuredCandidates = _.filter ctx.activeCandidates, (c) -> c.get('jobProfileApproved')
-    ctx.otherCandidates = _.reject ctx.activeCandidates, (c) -> c.get('jobProfileApproved')
-    ctx.remarks = {}
-    ctx.remarks[remark.get('user')] = remark for remark in @remarks.models
-    ctx.moment = moment
-    ctx._ = _
-    ctx
-
-  isEmployer: -> 'employer' in me.get('permissions', true)
-
-  setUpScrolling: ->
-    $(".nano").nanoScroller()
-    if window.history?.state?.lastViewedCandidateID
-      $(".nano").nanoScroller({scrollTo:$("#" + window.history.state.lastViewedCandidateID)})
-    else if window.location.hash.length is 25
-      $(".nano").nanoScroller({scrollTo:$(window.location.hash)})
-
-  checkForEmployerSignupHash: =>
-    if window.location.hash is "#employerSignupLoggingIn" and not ("employer" in me.get('permissions', true))
-      @openModalView new EmployerSignupModal
-      window.location.hash = ''
-
-  sortTable: ->
-    # http://mottie.github.io/tablesorter/docs/example-widget-bootstrap-theme.html
-    $.extend $.tablesorter.themes.bootstrap,
-      # these classes are added to the table. To see other table classes available,
-      # look here: http://twitter.github.com/bootstrap/base-css.html#tables
-      table: "table table-bordered"
-      caption: "caption"
-      header: "bootstrap-header" # give the header a gradient background
-      footerRow: ""
-      footerCells: ""
-      icons: "" # add "icon-white" to make them white; this icon class is added to the <i> in the header
-      sortNone: "bootstrap-icon-unsorted"
-      sortAsc: "icon-chevron-up"  # glyphicon glyphicon-chevron-up" # we are still using v2 icons
-      sortDesc: "icon-chevron-down"  # glyphicon-chevron-down" # we are still using v2 icons
-      active: "" # applied when column is sorted
-      hover: "" # use custom css here - bootstrap class may not override it
-      filterRow: "" # filter row class
-      even: "" # odd row zebra striping
-      odd: "" # even row zebra striping
-
-
-    # e = exact text from cell
-    # n = normalized value returned by the column parser
-    # f = search filter input value
-    # i = column index
-    # $r = ???
-    filterSelectExactMatch = (e, n, f, i, $r) -> e is f
-
-    # call the tablesorter plugin and apply the uitheme widget
-    @$el.find(".tablesorter").tablesorter
-      theme: "bootstrap"
-      widthFixed: true
-      headerTemplate: "{content} {icon}"
-      textSorter:
-        6: (a, b, direction, column, table) ->
-          days = []
-          for s in [a, b]
-            n = parseInt s
-            n = 0 unless _.isNumber n
-            n = 1 if /^a/.test s
-            for [duration, factor] in [
-              [/second/i, 1 / (86400 * 1000)]
-              [/minute/i, 1 / 1440]
-              [/hour/i, 1 / 24]
-              [/week/i, 7]
-              [/month/i, 30.42]
-              [/year/i, 365.2425]
-            ]
-              if duration.test s
-                n *= factor
-                break
-            if /^in /i.test s
-              n *= -1
-            days.push n
-          days[0] - days[1]
-      sortList: if @isEmployer() or me.isAdmin() then [[6, 0]] else [[0, 1]]
-    # widget code contained in the jquery.tablesorter.widgets.js file
-    # use the zebra stripe widget if you plan on hiding any rows (filter widget)
-      widgets: ["uitheme", "zebra", "filter"]
-      widgetOptions:
-      # using the default zebra striping class name, so it actually isn't included in the theme variable above
-      # this is ONLY needed for bootstrap theming if you are using the filter widget, because rows are hidden
-        zebra: ["even", "odd"]
-
-      # extra css class applied to the table row containing the filters & the inputs within that row
-        filter_cssFilter: ""
-
-      # If there are child rows in the table (rows with class name from "cssChildRow" option)
-      # and this option is true and a match is found anywhere in the child row, then it will make that row
-      # visible; default is false
-        filter_childRows: false
-
-      # if true, filters are collapsed initially, but can be revealed by hovering over the grey bar immediately
-      # below the header row. Additionally, tabbing through the document will open the filter row when an input gets focus
-        filter_hideFilters: false
-
-      # Set this option to false to make the searches case sensitive
-        filter_ignoreCase: true
-
-      # jQuery selector string of an element used to reset the filters
-        filter_reset: ".reset"
-
-      # Use the $.tablesorter.storage utility to save the most recent filters
-        filter_saveFilters: true
-
-      # Delay in milliseconds before the filter widget starts searching; This option prevents searching for
-      # every character while typing and should make searching large tables faster.
-        filter_searchDelay: 150
-
-      # Set this option to true to use the filter to find text from the start of the column
-      # So typing in "a" will find "albert" but not "frank", both have a's; default is false
-        filter_startsWith: false
-
-        filter_functions:
-          2:
-            "Full-time": filterSelectExactMatch
-            "Part-time": filterSelectExactMatch
-            "Contracting": filterSelectExactMatch
-            "Remote": filterSelectExactMatch
-            "Internship": filterSelectExactMatch
-          5:
-            "0-1": (e, n, f, i, $r) -> n <= 1
-            "2-5": (e, n, f, i, $r) -> 2 <= n <= 5
-            "6+": (e, n, f, i, $r) -> 6 <= n
-          6:
-            "Last day": (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 1
-            "Last week": (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 7
-            "Last 4 weeks": (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('profile-age')
-              days <= 28
-          8:
-            "✓": filterSelectExactMatch
-            "✗": filterSelectExactMatch
-
-  onCandidateClicked: (e) ->
-    id = $(e.target).closest('tr').data('candidate-id')
-    if id
-      if window.history
-        oldState = _.cloneDeep window.history.state ? {}
-        oldState["lastViewedCandidateID"] = id
-        window.history.replaceState(oldState,"")
-      else
-        window.location.hash = id
-      url = "/account/profile/#{id}"
-      window.open url,"_blank"
-    else
-      @openModalView new EmployerSignupModal
diff --git a/app/views/admin/EmployersListView.coffee b/app/views/admin/EmployersListView.coffee
deleted file mode 100644
index 8d23ece45..000000000
--- a/app/views/admin/EmployersListView.coffee
+++ /dev/null
@@ -1,152 +0,0 @@
-RootView = require 'views/core/RootView'
-template = require 'templates/admin/employer_list'
-User = require 'models/User'
-{me} = require 'core/auth'
-CocoCollection = require 'collections/CocoCollection'
-ModelModal = require 'views/modal/ModelModal'
-
-class EmployersCollection extends CocoCollection
-  url: '/db/user/x/employers'
-  model: User
-
-module.exports = class EmployersListView extends RootView
-  id: 'employers-view'
-  template: template
-
-  events:
-    'click tbody tr td:first-child': 'onEmployerClicked'
-
-  constructor: (options) ->
-    super options
-    @employers = @supermodel.loadCollection(new EmployersCollection(), 'employers').model
-
-  afterRender: ->
-    super()
-    @sortTable() if @employers.models.length
-
-  getRenderData: ->
-    ctx = super()
-    ctx.employers = @employers.models
-    ctx.moment = moment
-    ctx
-
-  sortTable: ->
-    # http://mottie.github.io/tablesorter/docs/example-widget-bootstrap-theme.html
-    $.extend $.tablesorter.themes.bootstrap,
-      # these classes are added to the table. To see other table classes available,
-      # look here: http://twitter.github.com/bootstrap/base-css.html#tables
-      table: 'table table-bordered'
-      caption: 'caption'
-      header: 'bootstrap-header' # give the header a gradient background
-      footerRow: ''
-      footerCells: ''
-      icons: '' # add 'icon-white' to make them white; this icon class is added to the <i> in the header
-      sortNone: 'bootstrap-icon-unsorted'
-      sortAsc: 'icon-chevron-up'  # glyphicon glyphicon-chevron-up' # we are still using v2 icons
-      sortDesc: 'icon-chevron-down'  # glyphicon-chevron-down' # we are still using v2 icons
-      active: '' # applied when column is sorted
-      hover: '' # use custom css here - bootstrap class may not override it
-      filterRow: '' # filter row class
-      even: '' # odd row zebra striping
-      odd: '' # even row zebra striping
-
-    # e = exact text from cell
-    # n = normalized value returned by the column parser
-    # f = search filter input value
-    # i = column index
-    # $r = ???
-    filterSelectExactMatch = (e, n, f, i, $r) -> e is f
-
-    # call the tablesorter plugin and apply the uitheme widget
-    @$el.find('.tablesorter').tablesorter
-      theme: 'bootstrap'
-      widthFixed: true
-      headerTemplate: '{content} {icon}'
-      textSorter:
-        6: (a, b, direction, column, table) ->
-          days = []
-          for s in [a, b]
-            n = parseInt s
-            n = 0 unless _.isNumber n
-            n = 1 if /^a/.test s
-            for [duration, factor] in [
-              [/second/i, 1 / (86400 * 1000)]
-              [/minute/i, 1 / 1440]
-              [/hour/i, 1 / 24]
-              [/week/i, 7]
-              [/month/i, 30.42]
-              [/year/i, 365.2425]
-            ]
-              if duration.test s
-                n *= factor
-                break
-            if /^in /i.test s
-              n *= -1
-            days.push n
-          days[0] - days[1]
-      sortList: [[6, 0]]
-      # widget code contained in the jquery.tablesorter.widgets.js file
-      # use the zebra stripe widget if you plan on hiding any rows (filter widget)
-      widgets: ['uitheme', 'zebra', 'filter']
-      widgetOptions:
-        # using the default zebra striping class name, so it actually isn't included in the theme variable above
-        # this is ONLY needed for bootstrap theming if you are using the filter widget, because rows are hidden
-        zebra: ['even', 'odd']
-
-        # extra css class applied to the table row containing the filters & the inputs within that row
-        filter_cssFilter: ''
-
-        # If there are child rows in the table (rows with class name from 'cssChildRow' option)
-        # and this option is true and a match is found anywhere in the child row, then it will make that row
-        # visible; default is false
-        filter_childRows: false
-
-        # if true, filters are collapsed initially, but can be revealed by hovering over the grey bar immediately
-        # below the header row. Additionally, tabbing through the document will open the filter row when an input gets focus
-        filter_hideFilters: false
-
-        # Set this option to false to make the searches case sensitive
-        filter_ignoreCase: true
-
-        # jQuery selector string of an element used to reset the filters
-        filter_reset: '.reset'
-
-        # Use the $.tablesorter.storage utility to save the most recent filters
-        filter_saveFilters: true
-
-        # Delay in milliseconds before the filter widget starts searching; This option prevents searching for
-        # every character while typing and should make searching large tables faster.
-        filter_searchDelay: 150
-
-        # Set this option to true to use the filter to find text from the start of the column
-        # So typing in 'a' will find 'albert' but not 'frank', both have a's; default is false
-        filter_startsWith: false
-
-        filter_functions:
-          3:
-            '0-1': (e, n, f, i, $r) -> parseInt(e) <= 1
-            '2-5': (e, n, f, i, $r) -> 2 <= parseInt(e) <= 5
-            '6+': (e, n, f, i, $r) -> 6 <= parseInt(e)
-          4:
-            '0-1': (e, n, f, i, $r) -> parseInt(e) <= 1
-            '2-5': (e, n, f, i, $r) -> 2 <= parseInt(e) <= 5
-            '6+': (e, n, f, i, $r) -> 6 <= parseInt(e)
-          5:
-            '0-1': (e, n, f, i, $r) -> parseInt(e) <= 1
-            '2-5': (e, n, f, i, $r) -> 2 <= parseInt(e) <= 5
-            '6+': (e, n, f, i, $r) -> 6 <= parseInt(e)
-          6:
-            'Last day': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('employer-age')
-              days <= 1
-            'Last week': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('employer-age')
-              days <= 7
-            'Last 4 weeks': (e, n, f, i, $r) ->
-              days = parseFloat $($r.find('td')[i]).data('employer-age')
-              days <= 28
-
-  onEmployerClicked: (e) ->
-    return unless id = $(e.target).closest('tr').data('employer-id')
-    employer = new User _id: id
-    @openModalView new ModelModal models: [employer]
diff --git a/app/views/admin/LevelSessionsView.coffee b/app/views/admin/LevelSessionsView.coffee
index 623152d38..bd19ac763 100644
--- a/app/views/admin/LevelSessionsView.coffee
+++ b/app/views/admin/LevelSessionsView.coffee
@@ -17,9 +17,3 @@ module.exports = class LevelSessionsView extends RootView
 
   getLevelSessions: ->
     @sessions = @supermodel.loadCollection(new LevelSessionCollection(), 'sessions', {cache: false}).model
-
-  getRenderData: =>
-    c = super()
-    c.sessions = @sessions.models
-    c.moment = moment
-    c
diff --git a/app/views/clans/ClansView.coffee b/app/views/clans/ClansView.coffee
index 800a22362..51f043b2b 100644
--- a/app/views/clans/ClansView.coffee
+++ b/app/views/clans/ClansView.coffee
@@ -72,7 +72,7 @@ module.exports = class ClansView extends RootView
     @supermodel.addRequestResource('user_names', options, 0).load()
 
   setupPrivateInfoPopover: ->
-    popoverTitle = "<h3>" + $.i18n.t('teachers.sub_includes_7') + "</h3>"
+    popoverTitle = "<h3>" + $.i18n.t('clans.private_clans') + "</h3>"
     popoverContent = "<ul>"
     popoverContent += "<li><span style='font-weight:bold;'>" + $.i18n.t('clans.track_concepts1') + "</span> " + $.i18n.t('clans.track_concepts2b')
     popoverContent += "<li>" + $.i18n.t('clans.track_concepts3b')
diff --git a/app/views/contribute/DiplomatView.coffee b/app/views/contribute/DiplomatView.coffee
index 6b664d279..994c024f5 100644
--- a/app/views/contribute/DiplomatView.coffee
+++ b/app/views/contribute/DiplomatView.coffee
@@ -94,7 +94,7 @@ module.exports = class DiplomatView extends ContributeClassView
     'es-419': ['2xG', 'Federico Tomas', 'Jesús Ruppel', 'Mariano Luzza', 'Matthew Burt']       # español (América Latina), Spanish (Latin America)
     'es-ES': ['3rr3s3v3n', 'Anon', 'DanielRodriguezRivero', 'Matthew Burt', 'OviiiOne', 'Pouyio', 'Vindurrin']        # español (ES), Spanish (Spain)
     'zh-HANS': ['1c7', 'Adam23', 'BonnieBBS', 'Cheng Zheng', 'Vic020', 'ZephyrSails', 'julycoolwind', 'onion7878', 'spacepope', 'yangxuan8282', 'yfdyh000']      # 简体中文, Chinese (Simplified)
-    'zh-HANT': ['Adam23', 'gintau']      # 繁体中文, Chinese (Traditional)
+    'zh-HANT': ['Adam23', 'gintau']      # 繁體中文, Chinese (Traditional)
     'zh-WUU-HANS': []  # 吴语, Wuu (Simplified)
     'zh-WUU-HANT': ['benojan']  # 吳語, Wuu (Traditional)
     fr: ['Anon', 'Armaldio', 'ChrisLightman', 'Elfisen', 'Feugy', 'MartinDelille', 'Oaugereau', 'Xeonarno', 'dc55028', 'jaybi', 'pstweb', 'veritable', 'xavismeh']             # français, French
@@ -131,7 +131,7 @@ module.exports = class DiplomatView extends ContributeClassView
     hi: []             # मानक हिन्दी, Hindi
     ur: []             # اُردُو, Urdu
     ms: []             # Bahasa Melayu, Bahasa Malaysia
-    ca: ['ArniMcFrag']             # Català, Catalan
+    ca: ['ArniMcFrag', 'Nainufar']             # Català, Catalan
     gl: ['mcaeiror']             # Galego, Galician
     'mk-MK': ['SuperPranx']             # Македонски, Macedonian
     eo: []             # Esperanto, Esperanto
diff --git a/app/views/core/AchievementPopup.coffee b/app/views/core/AchievementPopup.coffee
index 4d0b2036d..daefd64e1 100644
--- a/app/views/core/AchievementPopup.coffee
+++ b/app/views/core/AchievementPopup.coffee
@@ -65,7 +65,7 @@ module.exports = class AchievementPopup extends CocoView
     if @popup
       hide = =>
         return if @destroyed
-        @$el.animate {left: 600}, =>
+        @$el.animate {left: -600}, =>
           @$el.remove()
           @destroy()
       @$el.animate left: 0
diff --git a/app/views/core/ContactModal.coffee b/app/views/core/ContactModal.coffee
index 3d8bd01ae..8c9acf951 100644
--- a/app/views/core/ContactModal.coffee
+++ b/app/views/core/ContactModal.coffee
@@ -33,6 +33,7 @@ module.exports = class ContactModal extends ModalView
     res = tv4.validateMultiple contactMessage, contactSchema
     return forms.applyErrorsToForm @$el, res.errors unless res.valid
     @populateBrowserData contactMessage
+    contactMessage = _.merge contactMessage, @options
     contactMessage.country = me.get('country')
     window.tracker?.trackEvent 'Sent Feedback', message: contactMessage
     sendContactMessage contactMessage, @$el
diff --git a/app/views/core/ModalView.coffee b/app/views/core/ModalView.coffee
index 95fda6cb9..21a5b1f2e 100644
--- a/app/views/core/ModalView.coffee
+++ b/app/views/core/ModalView.coffee
@@ -24,13 +24,6 @@ module.exports = class ModalView extends CocoView
     super arguments...
     @options ?= {}
 
-  getRenderData: (context={}) ->
-    context = super(context)
-    context.closeButton = @closeButton
-    context.headerContent = @options.headerContent
-    context.bodyContent = @options.bodyContent
-    context
-
   subscriptions:
     {}
 
diff --git a/app/views/core/RootView.coffee b/app/views/core/RootView.coffee
index 34235d9de..632887c9a 100644
--- a/app/views/core/RootView.coffee
+++ b/app/views/core/RootView.coffee
@@ -100,6 +100,13 @@ module.exports = class RootView extends CocoView
     c.usesSocialMedia = @usesSocialMedia
     c
 
+  forumLink: ->
+    link = 'http://discourse.codecombat.com/'
+    lang = (me.get('preferredLanguage') or 'en-US').split('-')[0]
+    if lang in ['zh', 'ru', 'es', 'fr', 'pt', 'de', 'nl', 'lt']
+      link += "c/other-languages/#{lang}"
+    link
+
   afterRender: ->
     if @$el.find('#site-nav').length # hack...
       @$el.addClass('site-chrome')
@@ -171,3 +178,5 @@ module.exports = class RootView extends CocoView
       console.warn 'Error saving language:', errors
     res.success (model, response, options) ->
       #console.log 'Saved language:', newLang
+
+  logoutRedirectURL: '/'
diff --git a/app/views/core/SubscribeModal.coffee b/app/views/core/SubscribeModal.coffee
index a978ec0d6..0d5316276 100644
--- a/app/views/core/SubscribeModal.coffee
+++ b/app/views/core/SubscribeModal.coffee
@@ -3,16 +3,14 @@ template = require 'templates/core/subscribe-modal'
 stripeHandler = require 'core/services/stripe'
 utils = require 'core/utils'
 AuthModal = require 'views/core/AuthModal'
+Products = require 'collections/Products'
 
 module.exports = class SubscribeModal extends ModalView
   id: 'subscribe-modal'
   template: template
   plain: true
   closesOnClickOutside: false
-  product:
-    amount: 999
-    planID: 'basic'
-    yearAmount: 9900
+  planID: 'basic'
 
   subscriptions:
     'stripe:received-token': 'onStripeReceivedToken'
@@ -27,6 +25,13 @@ module.exports = class SubscribeModal extends ModalView
   constructor: (options) ->
     super(options)
     @state = 'standby'
+    @products = new Products()
+    @supermodel.loadCollection(@products, 'products')
+
+  onLoaded: ->
+    @basicProduct = @products.findWhere { name: 'basic_subscription' }
+    @yearProduct = @products.findWhere { name: 'year_subscription' }
+    super()
 
   afterRender: ->
     super()
@@ -51,13 +56,16 @@ module.exports = class SubscribeModal extends ModalView
       application.tracker?.trackEvent 'Subscription ask parent button click'
 
   setupParentInfoPopover: ->
+    return unless @products.size()
     popoverTitle = $.i18n.t 'subscribe.parents_title'
     levelsCompleted = me.get('stats')?.gamesCompleted or 'several'
     popoverContent = "<p>" + $.i18n.t('subscribe.parents_blurb1', nLevels: levelsCompleted) + "</p>"
     popoverContent += "<p>" + $.i18n.t('subscribe.parents_blurb1a') + "</p>"
     popoverContent += "<p>" + $.i18n.t('subscribe.parents_blurb2') + "</p>"
+    price = (@products.findWhere({'name': 'basic_subscription'}).get('amount') / 100).toFixed(2)
+    # TODO: Update i18next and use its own interpolation system instead
+    popoverContent = popoverContent.replace('{{price}}', price)
     popoverContent += "<p>" + $.i18n.t('subscribe.parents_blurb3') + "</p>"
-    #popoverContent = popoverContent.replace /9[.,]99/g, '3.99'  # Sale
     @$el.find('#parents-info').popover(
       animation: true
       html: true
@@ -70,9 +78,15 @@ module.exports = class SubscribeModal extends ModalView
       application.tracker?.trackEvent 'Subscription parent hover'
 
   setupPaymentMethodsInfoPopover: ->
+    return unless @products.size()
     popoverTitle = $.i18n.t('subscribe.payment_methods_title')
+    three_month_price = (@products.findWhere({'name': 'basic_subscription'}).get('amount') * 3 / 100).toFixed(2)
+    year_price = (@products.findWhere({name: 'year_subscription'}).get('amount') / 100).toFixed(2)
     popoverTitle += '<button type="button" class="close" onclick="$(&#39;#payment-methods-info&#39;).popover(&#39;hide&#39;);">&times;</button>'
     popoverContent = "<p>" + $.i18n.t('subscribe.payment_methods_blurb1') + "</p>"
+    # TODO: Update i18next and use its own interpolation system instead
+    popoverContent = popoverContent.replace('{{three_month_price}}', three_month_price)
+    popoverContent = popoverContent.replace('{{year_price}}', year_price)
     popoverContent += "<p>" + $.i18n.t('subscribe.payment_methods_blurb2') + " <a href='mailto:support@codecombat.com'>support@codecombat.com</a>."
     @$el.find('#payment-methods-info').popover(
       animation: true
@@ -109,12 +123,13 @@ module.exports = class SubscribeModal extends ModalView
     @$el.find('.parent-button').popover('hide')
 
   onClickPurchaseButton: (e) ->
+    return unless @basicProduct and @yearProduct
     @playSound 'menu-button-click'
     return @openModalView new AuthModal() if me.get('anonymous')
     application.tracker?.trackEvent 'Started subscription purchase'
     options = {
       description: $.i18n.t('subscribe.stripe_description')
-      amount: @product.amount
+      amount: @basicProduct.get('amount')
       alipay: if me.get('country') is 'china' or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
       alipayReusable: true
     }
@@ -136,9 +151,11 @@ module.exports = class SubscribeModal extends ModalView
     @playSound 'menu-button-click'
     return @openModalView new AuthModal() if me.get('anonymous')
     application.tracker?.trackEvent 'Started 1 year subscription purchase'
+    discount = @basicProduct.get('amount') * 12 - @yearProduct.get('amount')
+    discountString = (discount/100).toFixed(2)
     options =
-      description: $.i18n.t('subscribe.stripe_description_year_sale')
-      amount: @product.yearAmount
+      description: $.i18n.t('subscribe.stripe_description_year_sale').replace('{{discount}}', discountString)
+      amount: @yearProduct.get('amount')
       alipay: if me.get('country') is 'china' or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
       alipayReusable: true
     @purchasedAmount = options.amount
@@ -148,15 +165,15 @@ module.exports = class SubscribeModal extends ModalView
     @state = 'purchasing'
     @render()
 
-    if @purchasedAmount is @product.amount
+    if @purchasedAmount is @basicProduct.get('amount')
       stripe = _.clone(me.get('stripe') ? {})
-      stripe.planID = @product.planID
+      stripe.planID = @basicProduct.get('planID')
       stripe.token = e.token.id
       me.set 'stripe', stripe
       @listenToOnce me, 'sync', @onSubscriptionSuccess
       @listenToOnce me, 'error', @onSubscriptionError
       me.patch({headers: {'X-Change-Plan': 'true'}})
-    else if @purchasedAmount is @product.yearAmount
+    else if @purchasedAmount is @yearProduct.get('amount')
       # Purchasing a year
       data =
         stripe:
diff --git a/app/views/courses/ActivateLicensesModal.coffee b/app/views/courses/ActivateLicensesModal.coffee
index 3a9350146..efc997565 100644
--- a/app/views/courses/ActivateLicensesModal.coffee
+++ b/app/views/courses/ActivateLicensesModal.coffee
@@ -82,6 +82,7 @@ module.exports = class ActivateLicensesModal extends ModalView
         @usersToRedeem.remove(user)
         pct = 100 * (@usersToRedeem.originalSize - @usersToRedeem.size() / @usersToRedeem.originalSize)
         @$('#progress-area .progress-bar').css('width', "#{pct.toFixed(1)}%")
+        application.tracker?.trackEvent 'Enroll modal finished enroll student', category: 'Courses', userID: user.id
         @redeemUsers()
       error: (jqxhr, textStatus, errorThrown) ->
         if jqxhr.status is 402
diff --git a/app/views/courses/ClassroomView.coffee b/app/views/courses/ClassroomView.coffee
index 8ca00ef37..1005e38b3 100644
--- a/app/views/courses/ClassroomView.coffee
+++ b/app/views/courses/ClassroomView.coffee
@@ -4,6 +4,7 @@ Course = require 'models/Course'
 CourseInstance = require 'models/CourseInstance'
 Classroom = require 'models/Classroom'
 LevelSession = require 'models/LevelSession'
+Prepaids = require 'collections/Prepaids'
 RootView = require 'views/core/RootView'
 template = require 'templates/courses/classroom-view'
 User = require 'models/User'
@@ -41,6 +42,10 @@ module.exports = class ClassroomView extends RootView
     @courseInstances = new CocoCollection([], { url: "/db/course_instance", model: CourseInstance})
     @courseInstances.comparator = 'courseID'
     @supermodel.loadCollection(@courseInstances, 'course_instances', { data: { classroomID: classroomID } })
+    @prepaids = new Prepaids()
+    @prepaids.comparator = '_id'
+    @prepaids.fetchByCreator(me.id)
+    @supermodel.loadCollection(@prepaids, 'prepaids')
     @users = new CocoCollection([], { url: "/db/classroom/#{classroomID}/members", model: User })
     @users.comparator = (user) => user.broadName().toLowerCase()
     @supermodel.loadCollection(@users, 'users')
@@ -105,15 +110,35 @@ module.exports = class ClassroomView extends RootView
 
   onClickActivateSingleLicenseButton: (e) ->
     userID = $(e.target).closest('.btn').data('user-id')
-    user = @users.get(userID)
-    modal = new ActivateLicensesModal({
-      classroom: @classroom
-      users: @users
-      user: user
-    })
-    @openModalView(modal)
-    modal.once 'redeem-users', -> document.location.reload()
-    application.tracker?.trackEvent 'Classroom started enroll student', category: 'Courses', userID: userID
+    if @prepaids.totalMaxRedeemers() - @prepaids.totalRedeemers() > 0
+      # Have an unused enrollment, enroll student immediately instead of opening the enroll modal
+      prepaid = @prepaids.find((prepaid) -> prepaid.get('properties')?.endDate? and prepaid.openSpots())
+      prepaid = @prepaids.find((prepaid) -> prepaid.openSpots()) unless prepaid
+      $.ajax({
+        method: 'POST'
+        url: _.result(prepaid, 'url') + '/redeemers'
+        data: { userID: userID }
+        success: =>
+          application.tracker?.trackEvent 'Classroom finished enroll student', category: 'Courses', userID: userID
+          # TODO: do a lighter refresh here. @render() did not work out.
+          document.location.reload()
+        error: (jqxhr, textStatus, errorThrown) ->
+          if jqxhr.status is 402
+            message = arguments[2]
+          else
+            message = "#{jqxhr.status}: #{jqxhr.responseText}"
+          console.err message
+      })
+    else
+      user = @users.get(userID)
+      modal = new ActivateLicensesModal({
+        classroom: @classroom
+        users: @users
+        user: user
+      })
+      @openModalView(modal)
+      modal.once 'redeem-users', -> document.location.reload()
+      application.tracker?.trackEvent 'Classroom started enroll student', category: 'Courses', userID: userID
 
   onClickEditClassDetailsLink: ->
     modal = new ClassroomSettingsModal({classroom: @classroom})
diff --git a/app/views/courses/PurchaseCoursesView.coffee b/app/views/courses/PurchaseCoursesView.coffee
index 9c1aae564..a97c32cd9 100644
--- a/app/views/courses/PurchaseCoursesView.coffee
+++ b/app/views/courses/PurchaseCoursesView.coffee
@@ -9,12 +9,13 @@ stripeHandler = require 'core/services/stripe'
 template = require 'templates/courses/purchase-courses-view'
 User = require 'models/User'
 utils = require 'core/utils'
+Products = require 'collections/Products'
 
 module.exports = class PurchaseCoursesView extends RootView
   id: 'purchase-courses-view'
   template: template
   numberOfStudents: 30
-  pricePerStudent: 4
+  pricePerStudent: 0
 
   initialize: (options) ->
     @listenTo stripeHandler, 'received-token', @onStripeReceivedToken
@@ -29,13 +30,19 @@ module.exports = class PurchaseCoursesView extends RootView
     @prepaids.comparator = '_id'
     @prepaids.fetchByCreator(me.id)
     @supermodel.loadCollection(@prepaids, 'prepaids')
+    @products = new Products()
+    @supermodel.loadCollection(@products, 'products')
     super(options)
 
   events:
     'input #students-input': 'onInputStudentsInput'
     'click #purchase-btn': 'onClickPurchaseButton'
+    
+  onLoaded: ->
+    @pricePerStudent = @products.findWhere({name: 'course'}).get('amount')
+    super()
 
-  getPriceString: -> '$' + (@getPrice()).toFixed(2)
+  getPriceString: -> '$' + (@getPrice()/100).toFixed(2)
   getPrice: -> @pricePerStudent * @numberOfStudents
 
   onceClassroomsSync: ->
@@ -80,7 +87,7 @@ module.exports = class PurchaseCoursesView extends RootView
     application.tracker?.trackEvent 'Started course prepaid purchase', {
       price: @pricePerStudent, students: @numberOfStudents}
     stripeHandler.open
-      amount: @numberOfStudents * @pricePerStudent * 100
+      amount: @numberOfStudents * @pricePerStudent
       description: "Full course access for #{@numberOfStudents} students"
       bitcoin: true
       alipay: if me.get('country') is 'china' or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
diff --git a/app/views/courses/TeacherCoursesView.coffee b/app/views/courses/TeacherCoursesView.coffee
index 3913ba3d4..4b27c5c0c 100644
--- a/app/views/courses/TeacherCoursesView.coffee
+++ b/app/views/courses/TeacherCoursesView.coffee
@@ -1,3 +1,4 @@
+ActivateLicensesModal = require 'views/courses/ActivateLicensesModal'
 app = require 'core/application'
 AuthModal = require 'views/core/AuthModal'
 CocoCollection = require 'collections/CocoCollection'
@@ -17,6 +18,7 @@ module.exports = class TeacherCoursesView extends RootView
   template: template
 
   events:
+    'click #activate-licenses-btn': 'onClickActivateLicensesButton'
     'click .btn-add-students': 'onClickAddStudents'
     'click .create-new-class': 'onClickCreateNewClassButton'
     'click .edit-classroom-small': 'onClickEditClassroomSmall'
@@ -49,6 +51,14 @@ module.exports = class TeacherCoursesView extends RootView
         url: "/db/classroom/#{classroom.id}/members"
       })
 
+  onClickActivateLicensesButton: ->
+    modal = new ActivateLicensesModal({
+      users: @members
+    })
+    @openModalView(modal)
+    modal.once 'redeem-users', -> document.location.reload()
+    application.tracker?.trackEvent 'Courses teachers started enroll students', category: 'Courses'
+
   onClickAddStudents: (e) ->
     classroomID = $(e.target).data('classroom-id')
     classroom = @classrooms.get(classroomID)
diff --git a/app/views/editor/ThangTasksView.coffee b/app/views/editor/ThangTasksView.coffee
new file mode 100644
index 000000000..ecc9500a0
--- /dev/null
+++ b/app/views/editor/ThangTasksView.coffee
@@ -0,0 +1,48 @@
+RootView = require 'views/core/RootView'
+template = require 'templates/editor/thangTasksView'
+ThangType = require 'models/ThangType'
+CocoCollection = require 'collections/CocoCollection'
+
+module.exports = class ThangTasksView extends RootView
+  template: template
+  id: 'thang-tasks-view'
+  events:
+    'input input': 'searchUpdate'
+    'change input': 'searchUpdate'
+
+  constructor: (options) ->
+    super options
+    @thangs = new CocoCollection([],
+      url: '/db/thang.type?project=name,tasks,slug'
+      model: ThangType
+      comparator: @sortThangs
+    )
+    @lastLoad = (new Date()).getTime()
+    @listenTo(@thangs, 'sync', @onThangsLoaded)
+    @supermodel.loadCollection(@thangs, 'thangs')
+
+  searchUpdate: ->
+    if not @lastLoad? or (new Date()).getTime() - @lastLoad > 60 * 1000 * 1 # Update only after a minute from last update.
+      @thangs.fetch()
+      @listenTo(@thangs, 'sync', @onThangsLoaded)
+      @supermodel.loadCollection(@thangs, 'thangs')
+      @lastLoad = (new Date()).getTime()
+    else
+      @onThangsLoaded()
+      
+  onThangsLoaded: ->
+    @processedThangs = @thangs.filter (_elem) ->
+      # Case-insensitive search of input vs name.
+      return ///#{$('#nameSearch')[0].value}///i.test _elem.get('name')
+    for thang in @processedThangs
+      thang.tasks = _.filter thang.attributes.tasks, (_elem) ->
+        # Similar case-insensitive search of input vs description (name).
+        return ///#{$('#descSearch')[0].value}///i.test _elem.name
+    @renderSelectors '#thangTable'
+
+  sortThangs: (a, b) ->
+    a.get('name').localeCompare(b.get('name'))
+
+  # Jade helper
+  hasIncompleteTasks: (thang) ->
+    return thang.tasks and thang.tasks.filter((_elem) -> return not _elem.complete).length > 0
\ No newline at end of file
diff --git a/app/views/editor/campaign/CampaignEditorView.coffee b/app/views/editor/campaign/CampaignEditorView.coffee
index 9e1f15122..503c4cc20 100644
--- a/app/views/editor/campaign/CampaignEditorView.coffee
+++ b/app/views/editor/campaign/CampaignEditorView.coffee
@@ -144,11 +144,6 @@ module.exports = class CampaignEditorView extends RootView
 
     super()
 
-  getRenderData: ->
-    c = super()
-    c.campaign = @campaign
-    c
-
   onClickPatches: (e) ->
     @patchesView = @insertSubView(new PatchesView(@campaign), @$el.find('.patches-view'))
     @patchesView.load()
@@ -254,6 +249,7 @@ module.exports = class CampaignEditorView extends RootView
     @$el.find('#campaign-view').hide()
 
   updateRewardsForLevel: (level, rewards) ->
+    return  # Don't risk destruction of level unlock links
     achievements = @supermodel.getModels(Achievement)
     achievements = (a for a in achievements when a.get('related') is level.get('original'))
     for achievement in achievements
diff --git a/app/views/editor/component/ThangComponentConfigView.coffee b/app/views/editor/component/ThangComponentConfigView.coffee
index 5b624d2a5..084d72eae 100644
--- a/app/views/editor/component/ThangComponentConfigView.coffee
+++ b/app/views/editor/component/ThangComponentConfigView.coffee
@@ -21,13 +21,6 @@ module.exports = class ThangComponentConfigView extends CocoView
     @level = options.level
     @callback = options.callback
 
-  getRenderData: (context={}) ->
-    context = super(context)
-    context.component = @component.attributes
-    context.configProperties = []
-    context.isDefaultComponent = @isDefaultComponent
-    context
-
   afterRender: ->
     super()
     @buildTreema()
diff --git a/app/views/editor/level/RelatedAchievementsView.coffee b/app/views/editor/level/RelatedAchievementsView.coffee
index 14bd2b50c..52fac59f9 100644
--- a/app/views/editor/level/RelatedAchievementsView.coffee
+++ b/app/views/editor/level/RelatedAchievementsView.coffee
@@ -28,12 +28,6 @@ module.exports = class RelatedAchievementsView extends CocoView
     @loadingAchievements = true
     @render()
 
-  getRenderData: ->
-    c = super()
-    c.achievements = @achievements
-    c.relatedID = @relatedID
-    c
-
   onNewAchievementSaved: (achievement) ->
     # We actually open the new tab in NewAchievementModal, so we don't replace this window.
     #url = '/editor/achievement/' + (achievement.get('slug') or achievement.id)
diff --git a/app/views/editor/level/components/NewLevelComponentModal.coffee b/app/views/editor/level/components/NewLevelComponentModal.coffee
index 85251d743..53d112a23 100644
--- a/app/views/editor/level/components/NewLevelComponentModal.coffee
+++ b/app/views/editor/level/components/NewLevelComponentModal.coffee
@@ -14,10 +14,9 @@ module.exports = class NewLevelComponentModal extends ModalView
     'click #new-level-component-submit': 'makeNewLevelComponent'
     'submit form': 'makeNewLevelComponent'
 
-  getRenderData: ->
-    c = super()
-    c.systems = LevelComponent.schema.properties.system.enum
-    c
+  constructor: (options) ->
+    super options
+    @systems = LevelComponent.schema.properties.system.enum
 
   makeNewLevelComponent: (e) ->
     e.preventDefault()
diff --git a/app/views/editor/level/modals/GenerateTerrainModal.coffee b/app/views/editor/level/modals/GenerateTerrainModal.coffee
index e44b49bd1..9f95db954 100644
--- a/app/views/editor/level/modals/GenerateTerrainModal.coffee
+++ b/app/views/editor/level/modals/GenerateTerrainModal.coffee
@@ -344,6 +344,11 @@ module.exports = class GenerateTerrainModal extends ModalView
   events:
     'click .choose-option': 'onGenerate'
 
+  constructor: (options) ->
+    super options
+    @presets = presets
+    @presetSizes = presetSizes
+
   onRevertModel: (e) ->
     id = $(e.target).val()
     CocoModel.backedUp[id].revert()
@@ -635,11 +640,5 @@ module.exports = class GenerateTerrainModal extends ModalView
   getRandomThang: (thangList) ->
     return thangList[_.random(0, thangList.length-1)]
 
-  getRenderData: ->
-    c = super()
-    c.presets = presets
-    c.presetSizes = presetSizes
-    c
-
   onHidden: ->
     location.reload() if @reloadOnClose
diff --git a/app/views/editor/level/modals/NewAchievementModal.coffee b/app/views/editor/level/modals/NewAchievementModal.coffee
index 0978b3300..8d467f6a1 100644
--- a/app/views/editor/level/modals/NewAchievementModal.coffee
+++ b/app/views/editor/level/modals/NewAchievementModal.coffee
@@ -15,11 +15,6 @@ module.exports = class NewAchievementModal extends NewModelModal
     super options
     @level = options.level
 
-  getRenderData: ->
-    c = super()
-    c.level = @level
-    c
-
   onAchievementSubmitted: (e) ->
     slug = _.string.slugify @$el.find('#name').val()
     url = "/editor/achievement/#{slug}"
diff --git a/app/views/editor/level/modals/SaveLevelModal.coffee b/app/views/editor/level/modals/SaveLevelModal.coffee
index 3d890ff45..880892485 100644
--- a/app/views/editor/level/modals/SaveLevelModal.coffee
+++ b/app/views/editor/level/modals/SaveLevelModal.coffee
@@ -28,7 +28,7 @@ module.exports = class SaveLevelModal extends SaveVersionModal
     context.levelNeedsSave = @level.hasLocalChanges()
     context.modifiedComponents = _.filter @supermodel.getModels(LevelComponent), @shouldSaveEntity
     context.modifiedSystems = _.filter @supermodel.getModels(LevelSystem), @shouldSaveEntity
-    context.hasChanges = (context.levelNeedsSave or context.modifiedComponents.length or context.modifiedSystems.length)
+    @hasChanges = (context.levelNeedsSave or context.modifiedComponents.length or context.modifiedSystems.length)
     @lastContext = context
     context
 
diff --git a/app/views/editor/level/systems/LevelSystemEditView.coffee b/app/views/editor/level/systems/LevelSystemEditView.coffee
index c76a5372e..5b9edc12f 100644
--- a/app/views/editor/level/systems/LevelSystemEditView.coffee
+++ b/app/views/editor/level/systems/LevelSystemEditView.coffee
@@ -27,11 +27,6 @@ module.exports = class LevelSystemEditView extends CocoView
     @levelSystem = @supermodel.getModelByOriginalAndMajorVersion LevelSystem, options.original, options.majorVersion or 0
     console.log 'Couldn\'t get levelSystem for', options, 'from', @supermodel.models unless @levelSystem
 
-  getRenderData: (context={}) ->
-    context = super(context)
-    context.editTitle = "#{@levelSystem.get('name')}"
-    context
-
   afterRender: ->
     super()
     @buildSettingsTreema()
diff --git a/app/views/editor/level/thangs/ThangsTabView.coffee b/app/views/editor/level/thangs/ThangsTabView.coffee
index afc1e3047..8ce64029d 100644
--- a/app/views/editor/level/thangs/ThangsTabView.coffee
+++ b/app/views/editor/level/thangs/ThangsTabView.coffee
@@ -20,7 +20,7 @@ MOVE_SPEED = 13
 overlappableThangTypeNames = ['Torch', 'Chains', 'Bird', 'Cloud 1', 'Cloud 2', 'Cloud 3', 'Waterfall', 'Obstacle', 'Electrowall', 'Spike Walls']
 
 class ThangTypeSearchCollection extends CocoCollection
-  url: '/db/thang.type?project=original,name,version,slug,kind,components'
+  url: '/db/thang.type?project=original,name,version,slug,kind,components,prerenderedSpriteSheetData'
   model: ThangType
 
 module.exports = class ThangsTabView extends CocoView
diff --git a/app/views/editor/modal/NewModelModal.coffee b/app/views/editor/modal/NewModelModal.coffee
index 7debf7e00..49cba4036 100644
--- a/app/views/editor/modal/NewModelModal.coffee
+++ b/app/views/editor/modal/NewModelModal.coffee
@@ -17,13 +17,6 @@ module.exports = class NewModelModal extends ModalView
     @modelLabel = options.modelLabel
     @newModelTitle = "editor.new_#{_.string.slugify @modelLabel}_title"
     @properties = options.properties
-    $('#name').ready @focusOnName
-
-  getRenderData: ->
-    c = super()
-    c.modelLabel = @modelLabel
-    c.newModelTitle = @newModelTitle
-    c
 
   makeNewModel: ->
     model = new @modelClass
@@ -51,5 +44,6 @@ module.exports = class NewModelModal extends ModalView
       @trigger 'model-created', model
       #Backbone.Mediator.publish 'model-save-success', model
 
-  focusOnName: (e) ->
-    $('#name').focus() # TODO Why isn't this working anymore.. It does get called
+  afterInsert: ->
+    super()
+    _.delay (=> @$el?.find('#name').focus()), 500
diff --git a/app/views/editor/modal/SaveVersionModal.coffee b/app/views/editor/modal/SaveVersionModal.coffee
index f615c0d13..ad0bcd48b 100644
--- a/app/views/editor/modal/SaveVersionModal.coffee
+++ b/app/views/editor/modal/SaveVersionModal.coffee
@@ -21,12 +21,7 @@ module.exports = class SaveVersionModal extends ModalView
     super options
     @model = options.model or options.level
     @isPatch = not @model.hasWriteAccess()
-
-  getRenderData: ->
-    c = super()
-    c.isPatch = @isPatch
-    c.hasChanges = @model.hasLocalChanges()
-    c
+    @hasChanges = @model.hasLocalChanges()
 
   afterRender: (insertDeltaView=true) ->
     super()
diff --git a/app/views/ladder/LadderPlayModal.coffee b/app/views/ladder/LadderPlayModal.coffee
index 44c88a6fd..6eb812346 100644
--- a/app/views/ladder/LadderPlayModal.coffee
+++ b/app/views/ladder/LadderPlayModal.coffee
@@ -102,6 +102,7 @@ module.exports = class LadderPlayModal extends ModalView
       {id: 'coffeescript', name: 'CoffeeScript (Experimental)'}
       {id: 'clojure', name: 'Clojure (Experimental)'}
       {id: 'lua', name: 'Lua'}
+      {id: 'java', name: 'Java'}
       #{id: 'io', name: 'Io (Experimental)'}
     ]
     ctx.league = @options.league
diff --git a/app/views/ladder/SimulateTabView.coffee b/app/views/ladder/SimulateTabView.coffee
index 863698fba..8dd20b65d 100644
--- a/app/views/ladder/SimulateTabView.coffee
+++ b/app/views/ladder/SimulateTabView.coffee
@@ -20,15 +20,15 @@ module.exports = class SimulateTabView extends CocoView
     require 'vendor/aether-python'
     require 'vendor/aether-coffeescript'
     require 'vendor/aether-lua'
+    require 'vendor/aether-java'
     require 'vendor/aether-clojure'
     require 'vendor/aether-io'
 
   onLoaded: ->
     super()
     @render()
-    # Save our MongoDB oplog!
-    #if (document.location.hash is '#simulate' or @options.level.get('type') is 'course-ladder') and not @simulator
-    #  @startSimulating()
+    if (document.location.hash is '#simulate' or @options.level.get('type') is 'course-ladder') and not @simulator
+      @startSimulating()
 
   getRenderData: ->
     ctx = super()
diff --git a/app/views/modal/EmployerSignupModal.coffee b/app/views/modal/EmployerSignupModal.coffee
deleted file mode 100644
index 9f120d654..000000000
--- a/app/views/modal/EmployerSignupModal.coffee
+++ /dev/null
@@ -1,139 +0,0 @@
-ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/employer_signup_modal'
-forms = require 'core/forms'
-User = require 'models/User'
-auth = require 'core/auth'
-me = auth.me
-
-module.exports = class EmployerSignupModal extends ModalView
-  id: 'employer-signup'
-  template: template
-  closeButton: true
-
-  subscriptions:
-    'errors:server-error': 'onServerError'
-    'auth:linkedin-api-loaded': 'onLinkedInLoaded'
-    'created-user-without-reload': 'createdAccount'
-
-  events:
-    'click #contract-agreement-button': 'agreeToContract'
-    'click #create-account-button': 'createAccount'
-    'click #more-info-button': 'submitMoreInfoEmail'
-    'click .login-link': 'setHashToOpenModalAutomatically'
-    'keydown': 'checkForFormSubmissionEnterPress'
-
-  constructor: (options) ->
-    super(options)
-    return  # Removed LinkedIn, so if we want to resurrect the EmployerSignupModal, we'll want to redo it without LinkedIn auth.
-    @authorizedWithLinkedIn = IN?.User?.isAuthorized()
-    window.tracker?.trackEvent 'Started Employer Signup'
-    @reloadWhenClosed = false
-    @linkedinLoaded = Boolean(IN.parse)
-    @waitingForLinkedIn = false
-    @sentMoreInfoEmail = false
-    window.contractCallback = =>
-      @authorizedWithLinkedIn = IN?.User?.isAuthorized()
-      @render()
-
-  onLinkedInLoaded: =>
-    @linkedinLoaded = true
-    if @waitingForLinkedIn
-      @renderLinkedInButton()
-
-  renderLinkedInButton: =>
-    IN.parse()
-
-  onServerError: (e) ->
-    @disableModalInProgress(@$el)
-
-  afterInsert: ->
-    super()
-    linkedInButtonParentElement = document.getElementById('linkedInAuthButton')
-    if linkedInButtonParentElement
-      if @linkedinLoaded
-        @renderLinkedInButton()
-      else
-        @waitingForLinkedIn = true
-
-  getRenderData: ->
-    context = super()
-    context.userIsAuthorized = @authorizedWithLinkedIn
-    context.userHasSignedContract = 'employer' in me.get('permissions', true)
-    context.userIsAnonymous = context.me.get('anonymous')
-    context.sentMoreInfoEmail = @sentMoreInfoEmail
-    context
-
-  agreeToContract: ->
-    application.linkedinHandler.constructEmployerAgreementObject (err, profileData) =>
-      if err? then return handleAgreementFailure err
-      $.ajax
-        url: "/db/user/#{me.id}/agreeToEmployerAgreement"
-        data: profileData
-        type: 'POST'
-        success: @handleAgreementSuccess
-        error: @handleAgreementFailure
-
-  handleAgreementSuccess: (result) ->
-    window.tracker?.trackEvent 'Employer Agreed to Contract'
-    me.fetch cache: false
-    window.location.reload()
-
-  handleAgreementFailure: (error) ->
-    alert "There was an error signing the contract. Please contact team@codecombat.com with this error: #{error.responseText}"
-
-  checkForFormSubmissionEnterPress: (e) ->
-    if e.which is 13
-      if $('#signup-email').val() isnt '' and $('#signup-password').val() isnt ''
-        @createAccount(e)
-      else if $('#more-info-email').val() isnt ''
-        @submitMoreInfoEmail e
-
-  createAccount: (e) =>
-    window.tracker?.trackEvent 'Finished Employer Signup'
-    el = $('#signup-form')
-    e.stopPropagation()
-    forms.clearFormAlerts(el)
-    userObject = forms.formToObject el
-    delete userObject.subscribe
-    for key, val of me.attributes when key in ['preferredLanguage', 'testGroupNumber', 'dateCreated', 'wizardColor1', 'name', 'music', 'volume', 'emails']
-      userObject[key] ?= val
-    userObject.emails ?= {}
-    userObject.emails.employerNotes = {enabled: true}
-    res = tv4.validateMultiple userObject, User.schema
-    return forms.applyErrorsToForm(el, res.errors) unless res.valid
-    @enableModalInProgress(el)
-    auth.createUserWithoutReload userObject, null
-
-  submitMoreInfoEmail: (e) =>
-    emailAddress = $('#more-info-email').val()
-    window.tracker?.trackEvent 'Employer requested more information.'
-    successFunc = =>
-      @sentMoreInfoEmail = true
-      @render()
-    errorFunc = =>
-      alert('Something went wrong! Please contact team@codecombat.com for more information and inform them of this error.')
-    $.ajax
-      type: 'POST'
-      url: '/contact'
-      data:
-        email: emailAddress
-        message: "THIS IS AN AUTOMATED MESSAGE FROM THE EMPLOYER SIGNUP FORM \n Please send me more info about hiring CodeCombat players."
-      success: successFunc
-      error: errorFunc
-    $.post '/stacklead', email: emailAddress
-
-  setHashToOpenModalAutomatically: (e) ->
-    window.location.hash = 'employerSignupLoggingIn'
-
-  createdAccount: ->
-    @reloadWhenClosed = true
-    @listenTo me, 'sync', =>
-      @render()
-      IN.parse()
-    me.fetch cache: false
-
-  destroy: ->
-    reloadWhenClosed = @reloadWhenClosed
-    super()
-    if reloadWhenClosed
-      window.location.reload()
diff --git a/app/views/modal/JobProfileContactModal.coffee b/app/views/modal/JobProfileContactModal.coffee
deleted file mode 100644
index 40967ab8d..000000000
--- a/app/views/modal/JobProfileContactModal.coffee
+++ /dev/null
@@ -1,43 +0,0 @@
-ContactModal = require 'views/core/ContactModal'
-template = require 'templates/modal/job_profile_contact'
-
-forms = require 'core/forms'
-{sendContactMessage} = require 'core/contact'
-
-contactSchema =
-  additionalProperties: false
-  required: ['email', 'message']
-  properties:
-    email:
-      type: 'string'
-      maxLength: 100
-      minLength: 1
-      format: 'email'
-
-    subject:
-      type: 'string'
-      minLength: 1
-
-    message:
-      type: 'string'
-      minLength: 1
-
-    recipientID:
-      type: 'string'
-      minLength: 1
-
-module.exports = class JobProfileContactModal extends ContactModal
-  id: 'job-profile-contact-modal'
-  template: template
-
-  contact: ->
-    forms.clearFormAlerts @$el
-    contactMessage = forms.formToObject @$el
-    contactMessage.recipientID = @options.recipientID
-    res = tv4.validateMultiple contactMessage, contactSchema
-    return forms.applyErrorsToForm @$el, res.errors unless res.valid
-    contactMessage.message += "\n\n\n\n[For reference, the recipient's CodeCombat username is  #{@options.recipientUserName}!]"
-    window.tracker?.trackEvent 'Sent Job Profile Message', message: contactMessage
-    sendContactMessage contactMessage, @$el
-    $.post "/db/user/#{me.id}/track/contact_candidate"
-    $.post "/db/user/#{@options.recipientID}/track/contacted_by_employer" unless me.isAdmin()
diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee
index 7fa49b525..aa581c10f 100644
--- a/app/views/play/level/PlayLevelView.coffee
+++ b/app/views/play/level/PlayLevelView.coffee
@@ -404,8 +404,10 @@ module.exports = class PlayLevelView extends RootView
     require 'vendor/aether-python'
     require 'vendor/aether-coffeescript'
     require 'vendor/aether-lua'
+    require 'vendor/aether-java'
     require 'vendor/aether-clojure'
     require 'vendor/aether-io'
+    require 'vendor/aether-java'
     @simulateNextGame()
 
   simulateNextGame: ->
@@ -427,7 +429,7 @@ module.exports = class PlayLevelView extends RootView
 
   shouldSimulate: ->
     return true if @getQueryVariable('simulate') is true
-    return false  # Save our MongoDB oplog!
+    return false if @getQueryVariable('simulate') is false
     stillBuggy = true  # Keep this true while we still haven't fixed the zombie worker problem when simulating the more difficult levels on Chrome
     defaultCores = 2
     cores = window.navigator.hardwareConcurrency or defaultCores  # Available on Chrome/Opera, soon Safari
@@ -570,7 +572,7 @@ module.exports = class PlayLevelView extends RootView
     session.save {screenshot: screenshot}, {patch: true, type: 'PUT'}
 
   onContactClicked: (e) ->
-    @openModalView contactModal = new ContactModal()
+    @openModalView contactModal = new ContactModal levelID: @level.get('slug') or @level.id, courseID: @courseID, courseInstanceID: @courseInstanceID
     screenshot = @surface.screenshot(1, 'image/png', 1.0, 1)
     body =
       b64png: screenshot.replace 'data:image/png;base64,', ''
diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee
index 6f6edb8c4..67e5450f7 100644
--- a/app/views/play/level/modal/HeroVictoryModal.coffee
+++ b/app/views/play/level/modal/HeroVictoryModal.coffee
@@ -159,7 +159,7 @@ module.exports = class HeroVictoryModal extends ModalView
     for achievement in (@achievements?.models or [])
       earnedAchievement = earnedAchievementMap[achievement.id]
       if earnedAchievement
-        achievement.completedAWhileAgo = new Date().getTime() - Date.parse(earnedAchievement.get('created')) > 30 * 1000
+        achievement.completedAWhileAgo = new Date().getTime() - Date.parse(earnedAchievement.attributes.changed) > 30 * 1000
       achievement.worth = achievement.get 'worth', true
       achievement.gems = achievement.get('rewards')?.gems
     c.achievements = @achievements?.models.slice() or []
diff --git a/app/views/play/level/tome/DocFormatter.coffee b/app/views/play/level/tome/DocFormatter.coffee
index 79cee141b..72644029d 100644
--- a/app/views/play/level/tome/DocFormatter.coffee
+++ b/app/views/play/level/tome/DocFormatter.coffee
@@ -52,6 +52,7 @@ module.exports = class DocFormatter
       @doc.owner ?= 'this'
       ownerName = @doc.ownerName = if @doc.owner isnt 'this' then @doc.owner else switch @options.language
         when 'python', 'lua' then 'self'
+        when 'java' then 'hero'
         when 'coffeescript' then '@'
         else 'this'
       if @doc.type is 'function'
diff --git a/app/views/play/level/tome/SpellPaletteEntryView.coffee b/app/views/play/level/tome/SpellPaletteEntryView.coffee
index 9cdc15491..31f75fcaf 100644
--- a/app/views/play/level/tome/SpellPaletteEntryView.coffee
+++ b/app/views/play/level/tome/SpellPaletteEntryView.coffee
@@ -31,11 +31,6 @@ module.exports = class SpellPaletteEntryView extends CocoView
     @doc.initialHTML = @docFormatter.formatPopover()
     @aceEditors = []
 
-  getRenderData: ->
-    c = super()
-    c.doc = @doc
-    c
-
   afterRender: ->
     super()
     @$el.addClass(@doc.type)
diff --git a/app/views/play/level/tome/SpellPaletteView.coffee b/app/views/play/level/tome/SpellPaletteView.coffee
index 8a36e97d2..2171d4a4f 100644
--- a/app/views/play/level/tome/SpellPaletteView.coffee
+++ b/app/views/play/level/tome/SpellPaletteView.coffee
@@ -44,7 +44,7 @@ module.exports = class SpellPaletteView extends CocoView
     c.defaultGroupSlug = @defaultGroupSlug
     c.showsHelp = @showsHelp
     c.tabs = @tabs  # For hero-based, non-this-owned tabs like Vector, Math, etc.
-    c.thisName = {coffeescript: '@', lua: 'self', python: 'self'}[@options.language] or 'this'
+    c.thisName = {coffeescript: '@', lua: 'self', python: 'self', java: 'hero'}[@options.language] or 'this'
     c._ = _
     c
 
diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee
index a92ee9a2b..a8ad0cef8 100644
--- a/app/views/play/level/tome/SpellView.coffee
+++ b/app/views/play/level/tome/SpellView.coffee
@@ -218,7 +218,7 @@ module.exports = class SpellView extends CocoView
         disableSpaces = @options.level.get('disableSpaces') or false
         aceConfig = me.get('aceConfig') ? {}
         disableSpaces = false if aceConfig.keyBindings and aceConfig.keyBindings isnt 'default'  # Not in vim/emacs mode
-        disableSpaces = false if @spell.language in ['clojure', 'lua', 'coffeescript', 'io']  # Don't disable for more advanced/experimental languages
+        disableSpaces = false if @spell.language in ['clojure', 'lua', 'java', 'coffeescript', 'io']  # Don't disable for more advanced/experimental languages
         if not disableSpaces or (_.isNumber(disableSpaces) and disableSpaces < me.level())
           return @ace.execCommand 'insertstring', ' '
         line = @aceDoc.getLine @ace.getCursorPosition().row
diff --git a/app/views/play/menu/InventoryModal.coffee b/app/views/play/menu/InventoryModal.coffee
index e797b30eb..03927dc83 100644
--- a/app/views/play/menu/InventoryModal.coffee
+++ b/app/views/play/menu/InventoryModal.coffee
@@ -497,7 +497,9 @@ module.exports = class InventoryModal extends ModalView
     @playSound 'menu-button-click'
     @showLoading()
     ua = navigator.userAgent.toLowerCase()
-    unless me.isAdmin() or hasGoneFullScreenOnce and (/safari/.test(ua) and not /chrome/.test(ua)) or $(window).height() >= 658  # Min vertical resolution needed at 1366px wide
+    isSafari = /safari/.test(ua) and not /chrome/.test(ua)
+    isTooShort = $(window).height() < 658  # Min vertical resolution needed at 1366px wide
+    if isTooShort and not me.isAdmin() and not hasGoneFullScreenOnce and not isSafari
       @toggleFullscreen()
       hasGoneFullScreenOnce = true
     @updateConfig =>
diff --git a/app/views/play/modal/BuyGemsModal.coffee b/app/views/play/modal/BuyGemsModal.coffee
index 9840de7cd..2cdea7a75 100644
--- a/app/views/play/modal/BuyGemsModal.coffee
+++ b/app/views/play/modal/BuyGemsModal.coffee
@@ -3,18 +3,13 @@ template = require 'templates/play/modal/buy-gems-modal'
 stripeHandler = require 'core/services/stripe'
 utils = require 'core/utils'
 SubscribeModal = require 'views/core/SubscribeModal'
+Products = require 'collections/Products'
 
 module.exports = class BuyGemsModal extends ModalView
   id: 'buy-gems-modal'
   template: template
   plain: true
 
-  originalProducts: [
-    { price: '$4.99', gems: 5000, amount: 499, id: 'gems_5', i18n: 'buy_gems.few_gems' }
-    { price: '$9.99', gems: 11000, amount: 999, id: 'gems_10', i18n: 'buy_gems.pile_gems' }
-    { price: '$19.99', gems: 25000, amount: 1999, id: 'gems_20', i18n: 'buy_gems.chest_gems' }
-  ]
-
   subscriptions:
     'ipad:products': 'onIPadProducts'
     'ipad:iap-complete': 'onIAPComplete'
@@ -29,22 +24,21 @@ module.exports = class BuyGemsModal extends ModalView
     super(options)
     @timestampForPurchase = new Date().getTime()
     @state = 'standby'
+    @products = new Products()
+    @products.comparator = 'amount'
     if application.isIPadApp
       @products = []
       Backbone.Mediator.publish 'buy-gems-modal:update-products'
     else
-      @products = @originalProducts
+      @supermodel.loadCollection(@products, 'products')
       $.post '/db/payment/check-stripe-charges', (something, somethingElse, jqxhr) =>
         if jqxhr.status is 201
           @state = 'recovered_charge'
           @render()
 
-  getRenderData: ->
-    c = super()
-    c.products = @products
-    c.state = @state
-    c.stateMessage = @stateMessage
-    return c
+  onLoaded: ->
+    @products.reset @products.filter (product) -> _.string.startsWith(product.get('name'), 'gems_')
+    super()
 
   afterRender: ->
     super()
@@ -56,19 +50,20 @@ module.exports = class BuyGemsModal extends ModalView
     @playSound 'game-menu-close'
 
   onIPadProducts: (e) ->
-    newProducts = []
-    for iapProduct in e.products
-      localProduct = _.find @originalProducts, { id: iapProduct.id }
-      continue unless localProduct
-      localProduct.price = iapProduct.price
-      newProducts.push localProduct
-    @products = _.sortBy newProducts, 'gems'
-    @render()
+    # TODO: Update to handle new products collection
+#    newProducts = []
+#    for iapProduct in e.products
+#      localProduct = _.find @originalProducts, { id: iapProduct.id }
+#      continue unless localProduct
+#      localProduct.price = iapProduct.price
+#      newProducts.push localProduct
+#    @products = _.sortBy newProducts, 'gems'
+#    @render()
 
   onClickProductButton: (e) ->
     @playSound 'menu-button-click'
     productID = $(e.target).closest('button').val()
-    product = _.find @products, { id: productID }
+    product = @products.findWhere { name: productID }
 
     if application.isIPadApp
       Backbone.Mediator.publish 'buy-gems-modal:purchase-initiated', { productID: productID }
@@ -76,8 +71,8 @@ module.exports = class BuyGemsModal extends ModalView
     else
       application.tracker?.trackEvent 'Started gem purchase', { productID: productID }
       stripeHandler.open({
-        description: $.t(product.i18n)
-        amount: product.amount
+        description: $.t(product.get('i18n'))
+        amount: product.get('amount')
         bitcoin: true
         alipay: if me.get('country') is 'china' or (me.get('preferredLanguage') or 'en-US')[...2] is 'zh' then true else 'auto'
       })
@@ -86,7 +81,7 @@ module.exports = class BuyGemsModal extends ModalView
 
   onStripeReceivedToken: (e) ->
     data = {
-      productID: @productBeingPurchased.id
+      productID: @productBeingPurchased.get('name')
       stripe: {
         token: e.token.id
         timestamp: @timestampForPurchase
@@ -97,8 +92,8 @@ module.exports = class BuyGemsModal extends ModalView
     jqxhr = $.post('/db/payment', data)
     jqxhr.done(=>
       application.tracker?.trackEvent 'Finished gem purchase',
-        productID: @productBeingPurchased.id
-        value: @productBeingPurchased.amount
+        productID: @productBeingPurchased.get('name')
+        value: @productBeingPurchased.get('amount')
       document.location.reload()
     )
     jqxhr.fail(=>
@@ -116,7 +111,7 @@ module.exports = class BuyGemsModal extends ModalView
     )
 
   onIAPComplete: (e) ->
-    product = _.find @products, { id: e.productID }
+    product = @products.findWhere { name: e.productID }
     purchased = me.get('purchased') ? {}
     purchased = _.clone purchased
     purchased.gems ?= 0
diff --git a/app/views/play/modal/PlayAccountModal.coffee b/app/views/play/modal/PlayAccountModal.coffee
index cc4fc53e8..9a1adc440 100644
--- a/app/views/play/modal/PlayAccountModal.coffee
+++ b/app/views/play/modal/PlayAccountModal.coffee
@@ -14,10 +14,6 @@ module.exports = class PlayAccountModal extends ModalView
   constructor: (options) ->
     super options
 
-  getRenderData: (context={}) ->
-    context = super(context)
-    context
-
   afterRender: ->
     super()
     return unless @supermodel.finished()
diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee
index 382716511..c4ea0e19a 100644
--- a/app/views/play/modal/PlayHeroesModal.coffee
+++ b/app/views/play/modal/PlayHeroesModal.coffee
@@ -116,6 +116,9 @@ module.exports = class PlayHeroesModal extends ModalView
         #{id: 'io', name: "Io (#{$.i18n.t('choose_hero.experimental')})"}
       ]
 
+      if me.isAdmin() or not application.isProduction()
+        @codeLanguageList.push {id: 'java', name: "Java (#{$.i18n.t('choose_hero.experimental')})"}
+
   onHeroChanged: (e) ->
     direction = e.direction  # 'left' or 'right'
     heroItem = $(e.relatedTarget)
@@ -281,7 +284,6 @@ module.exports = class PlayHeroesModal extends ModalView
     popover?.$tip?.i18n()
 
   onBuyGemsPromptButtonClicked: (e) ->
-    @playSound 'menu-button-click'
     return @askToSignUp() if me.get('anonymous')
     @openModalView new BuyGemsModal()
 
diff --git a/app/views/play/modal/PollModal.coffee b/app/views/play/modal/PollModal.coffee
index c2baef8f5..4a9af778b 100644
--- a/app/views/play/modal/PollModal.coffee
+++ b/app/views/play/modal/PollModal.coffee
@@ -132,3 +132,4 @@ commentStarts =
   clojure: '; '
   lua: '-- '
   io: '// '
+  java: '// '
diff --git a/app/views/user/JobProfileCodeModal.coffee b/app/views/user/JobProfileCodeModal.coffee
deleted file mode 100644
index 392adf057..000000000
--- a/app/views/user/JobProfileCodeModal.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-ModalView = require 'views/core/ModalView'
-template = require 'templates/account/job-profile-code-modal'
-LevelSessionCodeView = require 'views/common/LevelSessionCodeView'
-
-module.exports = class JobProfileCodeModal extends ModalView
-  id: 'job-profile-code-modal'
-  template: template
-  modalWidthPercent: 90
-  plain: true
-
-  constructor: (options) ->
-    super(arguments...)
-    @session = options.session
-
-  afterRender: ->
-    super()
-    codeView = new LevelSessionCodeView({session:@session})
-    @insertSubView(codeView, @$el.find('.level-session-code-view'))
-
diff --git a/app/views/user/JobProfileView.coffee b/app/views/user/JobProfileView.coffee
deleted file mode 100644
index 9f83db9a3..000000000
--- a/app/views/user/JobProfileView.coffee
+++ /dev/null
@@ -1,463 +0,0 @@
-UserView = require 'views/common/UserView'
-template = require 'templates/account/job-profile-view'
-User = require 'models/User'
-LevelSession = require 'models/LevelSession'
-CocoCollection = require 'collections/CocoCollection'
-{me} = require 'core/auth'
-JobProfileContactModal = require 'views/modal/JobProfileContactModal'
-JobProfileTreemaView = require 'views/account/JobProfileTreemaView'
-UserRemark = require 'models/UserRemark'
-forms = require 'core/forms'
-ModelModal = require 'views/modal/ModelModal'
-JobProfileCodeModal = require './JobProfileCodeModal'
-require 'vendor/treema'
-
-class LevelSessionsCollection extends CocoCollection
-  url: -> "/db/user/#{@userID}/level.sessions/employer"
-  model: LevelSession
-  constructor: (@userID) ->
-    super()
-
-adminContacts = [
-  {id: '', name: 'Assign a Contact'}
-  {id: '512ef4805a67a8c507000001', name: 'Nick'}
-  {id: '5162fab9c92b4c751e000274', name: 'Scott'}
-  {id: '51eb2714fa058cb20d0006ef', name: 'Michael'}
-  {id: '51538fdb812dd9af02000001', name: 'George'}
-  {id: '52a57252a89409700d0000d9', name: 'Ignore'}
-]
-
-module.exports = class JobProfileView extends UserView
-  id: 'profile-view'
-  template: template
-  showBackground: false
-  usesSocialMedia: true
-
-  subscriptions: {}
-
-  events:
-    'click #toggle-editing': 'toggleEditing'
-    'click #toggle-job-profile-active': 'toggleJobProfileActive'
-    'click #toggle-job-profile-approved': 'toggleJobProfileApproved'
-    'click #save-notes-button': 'onJobProfileNotesChanged'
-    'click #contact-candidate': 'onContactCandidate'
-    'click #enter-espionage-mode': 'enterEspionageMode'
-    'click #open-model-modal': 'openModelModal'
-    'click .editable-profile .profile-photo': 'onEditProfilePhoto'
-    'click .editable-profile .project-image': 'onEditProjectImage'
-    'click .editable-profile .editable-display': 'onEditSection'
-    'click .editable-profile .save-section': 'onSaveSection'
-    'click .editable-profile .glyphicon-remove': 'onCancelSectionEdit'
-    'change .editable-profile .editable-array input': 'onEditArray'
-    'keyup .editable-profile .editable-array input': 'onEditArray'
-    'click .editable-profile a': 'onClickLinkWhileEditing'
-    'change #admin-contact': 'onAdminContactChanged'
-    'click .session-link': 'onSessionLinkPressed'
-
-  constructor: (options, userID) ->
-    @onJobProfileNotesChanged = _.debounce @onJobProfileNotesChanged, 1000
-    @onRemarkChanged = _.debounce @onRemarkChanged, 1000
-    require('core/services/filepicker')()  # Initialize if needed
-    super userID, options
-
-  onLoaded: ->
-    @finishInit() unless @destroyed
-    super()
-
-  finishInit: ->
-    return unless @userID
-    @uploadFilePath = "db/user/#{@userID}"
-
-    if @user?.get('firstName')
-      jobProfile = @user.get('jobProfile')
-      jobProfile ?= {}
-      if not jobProfile.name
-        jobProfile.name = (@user.get('firstName') + ' ' + @user.get('lastName')).trim()
-        @user.set('jobProfile', jobProfile)
-
-    @highlightedContainers = []
-    if me.isAdmin() or 'employer' in me.get('permissions', true)
-      $.post "/db/user/#{me.id}/track/view_candidate"
-      $.post "/db/user/#{@userID}/track/viewed_by_employer" unless me.isAdmin()
-    @sessions = @supermodel.loadCollection(new LevelSessionsCollection(@user.id), 'candidate_sessions').model
-    @listenToOnce @sessions, 'sync', => @render?()
-    if me.isAdmin()
-      # Mimicking how the VictoryModal fetches LevelFeedback
-      @remark = new UserRemark()
-      @remark.setURL "/db/user/#{@userID}/remark"
-      @remark.fetch cache: false
-      @listenToOnce @remark, 'sync', @onRemarkLoaded
-      @listenToOnce @remark, 'error', @onRemarkNotFound
-
-  onRemarkLoaded: ->
-    @remark.setURL "/db/user.remark/#{@remark.id}"
-    @render()
-
-  onRemarkNotFound: ->
-    @remark = new UserRemark()  # hmm, why do we create a new one here?
-    @remark.set 'user', @userID
-    @remark.set 'userName', name if name = @user.get('name')
-
-  jobProfileSchema: -> @user.schema().properties.jobProfile.properties
-
-  getRenderData: ->
-    context = super()
-    context.userID = @userID
-    context.profile = @user.get('jobProfile', true)
-    context.rawProfile = @user.get('jobProfile') or {}
-    context.user = @user
-    context.myProfile = @isMe()
-    context.allowedToViewJobProfile = @user and (me.isAdmin() or 'employer' in me.get('permissions', true) or (context.myProfile && !me.get('anonymous')))
-    context.allowedToEditJobProfile = @user and (me.isAdmin() or (context.myProfile && !me.get('anonymous')))
-    context.profileApproved = @user?.get 'jobProfileApproved'
-    context.progress = @progress ? @updateProgress()
-    @editing ?= context.myProfile and context.progress < 0.8
-    context.editing = @editing
-    context.marked = marked
-    context.moment = moment
-    context.iconForLink = @iconForLink
-    if links = context.profile.links
-      links = ($.extend(true, {}, link) for link in links)
-      link.icon = @iconForLink link for link in links
-      context.profileLinks = _.sortBy links, (link) -> not link.icon  # icons first
-    if @sessions
-      context.sessions = (s.attributes for s in @sessions.models when (s.get('submitted') or (s.get('levelID') is 'gridmancer') and s.get('code')?.thoktar?.plan?.length isnt 942))  # no default code
-      context.sessions.sort (a, b) -> (b.playtime ? 0) - (a.playtime ? 0)
-    else
-      context.sessions = []
-    context.adminContacts = adminContacts
-    context.remark = @remark
-    context
-
-  afterRender: ->
-    super()
-    if me.get('employerAt')
-      @$el.addClass 'viewed-by-employer'
-    return unless @user
-    unless @user.get('jobProfile')?.projects?.length or @editing
-      @$el.find('.right-column').hide()
-      @$el.find('.middle-column').addClass('double-column')
-    unless @editing
-      @$el.find('.editable-display').attr('title', '')
-    @initializeAutocomplete()
-    highlightNext = @highlightNext ? true
-    justSavedSection = @$el.find('#' + @justSavedSectionID).addClass 'just-saved'
-    _.defer =>
-      @progress = @updateProgress highlightNext
-      _.delay ->
-        justSavedSection.removeClass 'just-saved', duration: 1500, easing: 'easeOutQuad'
-      , 500
-    if me.isAdmin() and @user and @remark
-      visibleSettings = ['history', 'tasks']
-      data = _.pick (@remark.attributes), (value, key) -> key in visibleSettings
-      data.history ?= []
-      data.tasks ?= []
-      schema = _.cloneDeep @remark.schema()
-      schema.properties = _.pick schema.properties, (value, key) => key in visibleSettings
-      schema.required = _.intersection (schema.required ? []), visibleSettings
-      treemaOptions =
-        filePath: "db/user/#{@userID}"
-        schema: schema
-        data: data
-        aceUseWrapMode: true
-        callbacks: {change: @onRemarkChanged}
-      @remarkTreema = @$el.find('#remark-treema').treema treemaOptions
-      @remarkTreema?.build()
-      @remarkTreema?.open(3)
-
-  onRemarkChanged: (e) =>
-    return unless @remarkTreema.isValid()
-    for key in ['history', 'tasks']
-      val = _.filter(@remarkTreema.get(key), (entry) -> entry?.content or entry?.action)
-      entry.date ?= (new Date()).toISOString() for entry in val if key is 'history'
-      @remark.set key, val
-    @saveRemark()
-
-  initializeAutocomplete: (container) ->
-    (container ? @$el).find('input[data-autocomplete]').each ->
-      $(@).autocomplete(source: JobProfileTreemaView[$(@).data('autocomplete')], minLength: parseInt($(@).data('autocomplete-min-length')), delay: 0, autoFocus: true)
-
-  toggleEditing: ->
-    @editing = not @editing
-    @render()
-    @saveEdits()
-
-  toggleJobProfileApproved: ->
-    return unless me.isAdmin()
-    approved = not @user.get 'jobProfileApproved'
-    @user.set 'jobProfileApproved', approved
-    res = @user.patch()
-    res.success (model, response, options) => @render()
-
-  toggleJobProfileActive: ->
-    active = not @user.get('jobProfile').active
-    @user.get('jobProfile').active = active
-    @saveEdits()
-    if active and not (me.isAdmin() or @stackLed)
-      $.post '/stacklead'
-      @stackLed = true
-
-  enterEspionageMode: ->
-    postData = emailLower: @user.get('email').toLowerCase(), usernameLower: @user.get('name').toLowerCase()
-    $.ajax
-      type: 'POST',
-      url: '/auth/spy'
-      data: postData
-      success: @espionageSuccess
-
-  espionageSuccess: (model) ->
-    window.location.reload()
-
-  openModelModal: (e) ->
-    @openModalView new ModelModal models: [@user]
-
-  onJobProfileNotesChanged: (e) =>
-    notes = @$el.find('#job-profile-notes').val()
-    @user.set 'jobProfileNotes', notes
-    @user.save {jobProfileNotes: notes}, {patch: true, type: 'PUT'}
-
-  iconForLink: (link) ->
-    icons = [
-      {icon: 'facebook', name: 'Facebook', domain: /facebook\.com/, match: /facebook/i}
-      {icon: 'twitter', name: 'Twitter', domain: /twitter\.com/, match: /twitter/i}
-      {icon: 'github', name: 'GitHub', domain: /github\.(com|io)/, match: /github/i}
-      {icon: 'gplus', name: 'Google Plus', domain: /plus\.google\.com/, match: /(google|^g).?(\+|plus)/i}
-      {icon: 'linkedin', name: 'LinkedIn', domain: /linkedin\.com/, match: /(google|^g).?(\+|plus)/i}
-    ]
-    for icon in icons
-      if (link.name.search(icon.match) isnt -1) or (link.link.search(icon.domain) isnt -1)
-        icon.url = "/images/pages/account/profile/icon_#{icon.icon}.png"
-        return icon
-    null
-
-  onContactCandidate: (e) ->
-    @openModalView new JobProfileContactModal recipientID: @user.id, recipientUserName: @user.get('name')
-
-  showErrors: (errors) ->
-    section = @$el.find '.saving'
-    console.error 'Couldn\'t save because of validation errors:', errors
-    section.removeClass 'saving'
-    forms.clearFormAlerts section
-    # This is pretty lame, since we don't easily match which field had the error like forms.applyErrorsToForm can.
-    section.find('form').addClass('has-error').find('.save-section').before($("<span class='help-block error-help-block'>#{errors[0].message}</span>"))
-
-  saveEdits: (highlightNext) ->
-    errors = @user.validate()
-    return @showErrors errors if errors
-    jobProfile = @user.get('jobProfile')
-    jobProfile.updated = (new Date()).toISOString() if @user is me
-    @user.set 'jobProfile', jobProfile
-    return unless res = @user.save()
-    res.error =>
-      return if @destroyed
-      @showErrors [message: res.responseText]
-    res.success (model, response, options) =>
-      return if @destroyed
-      @justSavedSectionID = @$el.find('.editable-section.saving').removeClass('saving').attr('id')
-      @highlightNext = highlightNext
-      @render()
-      @highlightNext = false
-      @justSavedSectionID = null
-
-  onEditProfilePhoto: (e) ->
-    onSaving = =>
-      @$el.find('.profile-photo').addClass('saving')
-    onSaved = (uploadingPath) =>
-      @user.get('jobProfile').photoURL = uploadingPath
-      @saveEdits()
-    filepicker.pick {mimetypes: 'image/*'}, @onImageChosen(onSaving, onSaved)
-
-  onEditProjectImage: (e) ->
-    img = $(e.target)
-    onSaving = =>
-      img.addClass('saving')
-    onSaved = (uploadingPath) =>
-      img.parent().find('input').val(uploadingPath)
-      img.css('background-image', "url('/file/#{uploadingPath}')")
-      img.removeClass('saving')
-    filepicker.pick {mimetypes: 'image/*'}, @onImageChosen(onSaving, onSaved)
-
-  formatImagePostData: (inkBlob) ->
-    url: inkBlob.url, filename: inkBlob.filename, mimetype: inkBlob.mimetype, path: @uploadFilePath, force: true
-
-  onImageChosen: (onSaving, onSaved) ->
-    (inkBlob) =>
-      onSaving()
-      uploadingPath = [@uploadFilePath, inkBlob.filename].join('/')
-      $.ajax '/file', type: 'POST', data: @formatImagePostData(inkBlob), success: @onImageUploaded(onSaved, uploadingPath)
-
-  onImageUploaded: (onSaved, uploadingPath) ->
-    (e) =>
-      onSaved uploadingPath
-
-  onEditSection: (e) ->
-    @$el.find('.emphasized').removeClass('emphasized')
-    section = $(e.target).closest('.editable-section').removeClass 'deemphasized'
-    section.find('.editable-form').show().find('select, input, textarea').first().focus()
-    section.find('.editable-display').hide()
-    @$el.find('.editable-section').not(section).addClass 'deemphasized'
-    column = section.closest('.full-height-column')
-    @$el.find('.full-height-column').not(column).addClass 'deemphasized'
-
-  onCancelSectionEdit: (e) ->
-    @render()
-
-  onSaveSection: (e) ->
-    e.preventDefault()
-    section = $(e.target).closest('.editable-section')
-    form = $(e.target).closest('form')
-    isEmpty = @arrayItemIsEmpty
-    section.find('.array-item').each ->
-      $(@).remove() if isEmpty @
-    resetOnce = false  # We have to clear out arrays if we're going to redo them
-    serialized = form.serializeArray()
-    jobProfile = @user.get('jobProfile') or {}
-    jobProfile[prop] ?= [] for prop in ['links', 'skills', 'work', 'education', 'projects']
-    rootPropertiesSeen = {}
-    for field in serialized
-      keyChain = @extractFieldKeyChain field.name
-      value = @extractFieldValue keyChain[0], field.value
-      parent = jobProfile
-      for key, i in keyChain
-        rootPropertiesSeen[key] = true unless i
-        break if i is keyChain.length - 1
-        parent[key] ?= {}
-        child = parent[key]
-        if _.isArray(child) and not resetOnce
-          child = parent[key] = []
-          resetOnce = true
-        else unless child?
-          child = parent[key] = {}
-        parent = child
-      if key is 'link' and keyChain[0] is 'projects' and not value
-        delete parent[key]
-      else
-        parent[key] = value
-    form.find('.editable-array').each ->
-      key = $(@).data('property')
-      unless rootPropertiesSeen[key]
-        jobProfile[key] = []
-    if section.hasClass('projects-container') and not section.find('.array-item').length
-      jobProfile.projects = []
-    section.addClass 'saving'
-    @user.set('jobProfile', jobProfile)
-    @saveEdits true
-
-  extractFieldKeyChain: (key) ->
-    # 'root[projects][0][name]' -> ['projects', '0', 'name']
-    key.replace(/^root/, '').replace(/\[(.*?)\]/g, '.$1').replace(/^\./, '').split(/\./)
-
-  extractFieldValue: (key, value) ->
-    switch key
-      when 'active' then Boolean value
-      when 'experience' then parseInt value or '0'
-      else value
-
-  arrayItemIsEmpty: (arrayItem) ->
-    for input in $(arrayItem).find('input[type!=hidden], textarea')
-      return false if $(input).val().trim()
-    true
-
-  onEditArray: (e) ->
-    # We make sure there's always an empty array item at the end for the user to add to, deleting interstitial empties.
-    array = $(e.target).closest('.editable-array')
-    arrayItems = array.find('.array-item')
-    toRemove = []
-    for arrayItem, index in arrayItems
-      empty = @arrayItemIsEmpty arrayItem
-      if index is arrayItems.length - 1
-        lastEmpty = empty
-      else if empty and not $(arrayItem).find('input:focus, textarea:focus').length
-        toRemove.unshift index
-    $(arrayItems[emptyIndex]).remove() for emptyIndex in toRemove
-    unless lastEmpty
-      clone = $(arrayItem).clone(false)
-      clone.find('input').each -> $(@).val('')
-      clone.find('textarea').each -> $(@).text('')
-      array.append clone
-      @initializeAutocomplete clone
-    for arrayItem, index in array.find('.array-item')
-      for input in $(arrayItem).find('input, textarea')
-        $(input).attr('name', $(input).attr('name').replace(/\[\d+\]/, "[#{index}]"))
-
-  onClickLinkWhileEditing: (e) ->
-    e.preventDefault()
-
-  onAdminContactChanged: (e) ->
-    newContact = @$el.find('#admin-contact').val()
-    newContactName = if newContact then _.find(adminContacts, id: newContact).name else ''
-    @remark.set 'contact', newContact
-    @remark.set 'contactName', newContactName
-    @saveRemark()
-
-  saveRemark: ->
-    @remark.set 'user', @user.id
-    @remark.set 'userName', @user.get('name')
-    if errors = @remark.validate()
-      return console.error 'UserRemark', @remark, 'failed validation with errors:', errors
-    res = @remark.save()
-    res.error =>
-      return if @destroyed
-      console.error 'UserRemark', @remark, 'failed to save with error:', res.responseText
-    res.success (model, response, options) =>
-      return if @destroyed
-      console.log 'Saved UserRemark', @remark, 'with response', response
-
-  updateProgress: (highlightNext) ->
-    return unless @user?.loaded and @sessions?.loaded
-    completed = 0
-    totalWeight = 0
-    next = null
-    for metric in metrics = @getProgressMetrics()
-      done = metric.fn()
-      completed += metric.weight if done
-      totalWeight += metric.weight
-      next = metric unless next or done
-    progress = Math.round 100 * completed / totalWeight
-    bar = @$el.find('.profile-completion-progress .progress-bar')
-    bar.css 'width', "#{progress}%"
-    if next
-      text = ''
-      t = $.i18n.t
-      text = "#{progress}% #{t 'account_profile.complete'}. #{t 'account_profile.next'}: #{next.name}"
-      bar.parent().show().find('.progress-text').text text
-      if highlightNext and next?.container and not (next.container in @highlightedContainers)
-        @highlightedContainers.push next.container
-        @$el.find(next.container).addClass 'emphasized'
-        #@onEditSection target: next.container
-        #$('#page-container').scrollTop 0
-    else
-      bar.parent().hide()
-    completed / totalWeight
-
-  getProgressMetrics: ->
-    schema = me.schema().properties.jobProfile
-    jobProfile = @user.get('jobProfile') ? {}
-    exists = (field) -> -> jobProfile[field]
-    modified = (field) -> -> jobProfile[field] and jobProfile[field] isnt schema.properties[field].default
-    listStarted = (field, subfields) -> -> jobProfile[field]?.length and _.every subfields, (subfield) -> jobProfile[field][0][subfield]
-    t = $.i18n.t
-    @progressMetrics = [
-      {name: t('account_profile.next_name'), weight: 1, container: '#name-container', fn: modified 'name'}
-      {name: t('account_profile.next_short_description'), weight: 2, container: '#short-description-container', fn: modified 'shortDescription'}
-      {name: t('account_profile.next_skills'), weight: 2, container: '#skills-container', fn: -> jobProfile.skills?.length >= 5}
-      {name: t('account_profile.next_long_description'), weight: 3, container: '#long-description-container', fn: modified 'longDescription'}
-      {name: t('account_profile.next_work'), weight: 3, container: '#work-container', fn: listStarted 'work', ['role', 'employer']}
-      {name: t('account_profile.next_education'), weight: 3, container: '#education-container', fn: listStarted 'education', ['degree', 'school']}
-      {name: t('account_profile.next_projects'), weight: 3, container: '#projects-container', fn: listStarted 'projects', ['name']}
-      {name: t('account_profile.next_city'), weight: 1, container: '#basic-info-container', fn: modified 'city'}
-      {name: t('account_profile.next_country'), weight: 0, container: '#basic-info-container', fn: exists 'country'}
-      {name: t('account_profile.next_links'), weight: 2, container: '#links-container', fn: listStarted 'links', ['link', 'name']}
-      {name: t('account_profile.next_photo'), weight: 2, container: '#profile-photo-container', fn: modified 'photoURL'}
-      {name: t('account_profile.next_active'), weight: 1, fn: modified 'active'}
-    ]
-
-  onSessionLinkPressed: (e) ->
-    sessionID = $(e.target).closest('.session-link').data('session-id')
-    session = _.find @sessions.models, (session) -> session.id is sessionID
-    modal = new JobProfileCodeModal({session:session})
-    @openModalView modal
-
-  destroy: ->
-    @remarkTreema?.destroy()
-    super()
diff --git a/app/views/user/MainUserView.coffee b/app/views/user/MainUserView.coffee
index 658fb3be4..37b343e2d 100644
--- a/app/views/user/MainUserView.coffee
+++ b/app/views/user/MainUserView.coffee
@@ -49,6 +49,7 @@ module.exports = class MainUserView extends UserView
       context.singlePlayerSessions = singlePlayerSessions
       context.multiPlayerSessions = multiPlayerSessions
       context.favoriteLanguage = favoriteLanguage
+      context.playerLevel = @user.level()
     if @earnedAchievements and @earnedAchievements.loaded
       context.earnedAchievements = @earnedAchievements
     if @clans and @clans.loaded
diff --git a/bower.json b/bower.json
index c66802b7b..3bc0a2f44 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,7 @@
     "firepad": "~0.1.2",
     "marked": "~0.3.0",
     "moment": "~2.5.0",
-    "aether": "~0.3.0",
+    "aether": "~0.4.0",
     "underscore.string": "~2.3.3",
     "firebase": "~1.0.2",
     "d3": "~3.4.4",
@@ -107,7 +107,8 @@
         "build/io.js",
         "build/javascript.js",
         "build/lua.js",
-        "build/python.js"
+        "build/python.js",
+        "build/java.js"
       ]
     }
   },
diff --git a/config.coffee b/config.coffee
index 475369f52..8edc4f604 100644
--- a/config.coffee
+++ b/config.coffee
@@ -114,7 +114,9 @@ exports.config =
         'javascripts/app/vendor/aether-io.js': 'bower_components/aether/build/io.js'
         'javascripts/app/vendor/aether-javascript.js': 'bower_components/aether/build/javascript.js'
         'javascripts/app/vendor/aether-lua.js': 'bower_components/aether/build/lua.js'
+        'javascripts/app/vendor/aether-java.js': 'bower_components/aether/build/java.js'
         'javascripts/app/vendor/aether-python.js': 'bower_components/aether/build/python.js'
+        'javascripts/app/vendor/aether-java.js': 'bower_components/aether/build/java.js'
 
         # Any vendor libraries we don't want the client to load immediately
         'javascripts/app/vendor/d3.js': regJoin('^bower_components/d3')
diff --git a/headless_client/worker_world.coffee b/headless_client/worker_world.coffee
index 7e46146ae..e6e7c8c5c 100644
--- a/headless_client/worker_world.coffee
+++ b/headless_client/worker_world.coffee
@@ -188,6 +188,7 @@ for codeFile in [
     'app/vendor/aether-javascript.js'
     'app/vendor/aether-lua.js'
     'app/vendor/aether-python.js'
+    'app/vendor/aether-java.js'
   ]
   codeFileContents.push fs.readFileSync(__dirname + "/../public/javascripts/#{codeFile}", 'utf8')
 
diff --git a/package.json b/package.json
index 6a355c988..5b66726d2 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
   "dependencies": {
     "JQDeferred": "~2.1.0",
     "ace-builds": "https://github.com/ajaxorg/ace-builds/archive/3fb55e8e374ab02ce47c1ae55ffb60a1835f3055.tar.gz",
-    "aether": "~0.3.0",
+    "aether": "~0.4.0",
     "async": "0.2.x",
     "aws-sdk": "~2.0.0",
     "bayesian-battle": "0.0.x",
@@ -120,7 +120,7 @@
   },
   "optionalDependencies": {
     "newrelic": "^1.24.0",
-    "webworker-threads": "~0.5.5"
+    "webworker-threads": "~0.6.2"
   },
   "license": "MIT for the code, and CC-BY for the art and music",
   "private": true,
diff --git a/scripts/analytics/mongodb/queries/averageLevelPlaytimes.js b/scripts/analytics/mongodb/queries/averageLevelPlaytimes.js
index d3a889202..3119e2292 100644
--- a/scripts/analytics/mongodb/queries/averageLevelPlaytimes.js
+++ b/scripts/analytics/mongodb/queries/averageLevelPlaytimes.js
@@ -1,65 +1,41 @@
-// Average level playtimes by campaign
+// Average level playtimes in seconds by campaign, broken up by course and campaign levels
 
 // Usage:
 // mongo <address>:<port>/<database> <script file> -u <username> -p <password>
 
 // NOTE: faster to use find() instead of aggregate()
-// NOTE: faster to ask for one level at a time.  also keeps levels in campaign order
+// NOTE: faster to ask for one level at a time.
 
-// Excluded for one reason or another
-// Some relevant code:  https://github.com/codecombat/codecombat/blob/master/app/views/play/CampaignView.coffee#L281-L292
-var excludedLevels = ['deadly-dungeon-rescue', 'kithgard-brawl', 'cavern-survival', 'kithgard-mastery', 'destroying-angel', 'kithgard-apprentice', 'wild-horses', 'lost-viking', 'forest-flower-grove', 'boulder-woods', 'the-trials'];
+var courseCampaigns = ['intro', 'course-2', 'course-3', 'course-4'];
+var individualCampaigns = ['dungeon', 'forest', 'desert', 'mountain'];
 
 var scriptStartTime = new Date();
-var startDay = '2015-07-01';
-var endDay = '2015-08-06';
+var startDay = '2015-12-06';
+var endDay = '2015-12-13';
 
-log("Dates: " + startDay + " to " + endDay);
+print("Dates: " + startDay + " to " + endDay);
 
 // Print out playtimes for each campaign
-var campaigns = getCampaigns();
+var campaigns = getCampaigns(courseCampaigns);
+
 for (var i = 0; i < campaigns.length; i++) {
   var campaign = campaigns[i];
-  // if (campaign.slug !== 'dungeon') continue;
-  print(campaign.slug + " (free)");
-  var total = 0;
-
-  for (var j = 0; j < campaign.free.length; j++) {
-    var levelSlug = campaign.free[j];
-    if (excludedLevels.indexOf(levelSlug) >= 0) continue;
-    var data = getPlaytimes([levelSlug]);
-    print(data[levelSlug].average + "\t" + data[levelSlug].count + "\t" + levelSlug);
-    total += data[levelSlug];
-  }
-  // print(parseInt(total/60/60) + "\t\t total hours");
-  total = 0;
-
-  print(campaign.slug + " (paid)");
-  for (var j = 0; j < campaign.paid.length; j++) {
-    var levelSlug = campaign.paid[j];
-    if (excludedLevels.indexOf(levelSlug) >= 0) continue;
-    var data = getPlaytimes([levelSlug]);
-    if (data[levelSlug]) {
-      print(data[levelSlug].average + "\t" + data[levelSlug].count + "\t" + levelSlug);
-      total += data[levelSlug];
+  print(campaign.slug);
+  print("Sessions\tAverage\tSessions\tAverage\tLevel");
+  for (var j = 0; j < campaign.levelSlugs.length; j++) {
+    var levelSlug = campaign.levelSlugs[j];
+    var levelPlaytimes = getPlaytimes([levelSlug]);
+    if (levelPlaytimes[levelSlug]) {
+      print(levelPlaytimes[levelSlug].campaign.count,
+        '\t', levelPlaytimes[levelSlug].campaign.average,
+        '\t', levelPlaytimes[levelSlug].course.count,
+        '\t', levelPlaytimes[levelSlug].course.average,
+        '\t', levelSlug);
     }
     else {
-      print("0\t0\t" + levelSlug);
+      print(0, '\t', 0, '\t', 0, '\t', 0, '\t', levelSlug);
     }
   }
-  // print(parseInt(total/60/60) + "\t\t total hours");
-  total = 0;
-
-  print(campaign.slug + " (replayable)");
-  for (var j = 0; j < campaign.replayable.length; j++) {
-    var levelSlug = campaign.replayable[j];
-    if (excludedLevels.indexOf(levelSlug) >= 0) continue;
-    var data = getPlaytimes([levelSlug]);
-    print(data[levelSlug].average + "\t" + data[levelSlug].count + "\t" + levelSlug);
-    total += data[levelSlug];
-  }
-  // print(parseInt(total/60/60) + "\t\t total hours");
-
   // break;
 }
 
@@ -79,32 +55,32 @@ function objectIdWithTimestamp(timestamp) {
   return constructedObjectId
 }
 
-function getCampaigns() {
+function getCampaigns(campaignSlugs) {
   var campaigns = [];
-  var cursor = db.campaigns.find({}, {slug: 1, levels: 1});
+  var cursor = db.campaigns.find({slug: {$in: campaignSlugs}}, {slug: 1, levels: 1});
   var allFree = 0;
   var allpaid = 0;
   while (cursor.hasNext()) {
     var doc = cursor.next();
     if (doc.slug === 'auditions') continue;
-    var campaign = {slug: doc.slug, free: [], paid: [], replayable: []};
+    var campaign = {slug: doc.slug, levelSlugs: []};
     for (var levelID in doc.levels) {
-      if (doc.levels[levelID].replayable) {
-        campaign.replayable.push(doc.levels[levelID].slug);
-      }
-      else if (doc.levels[levelID].requiresSubscription) {
-        campaign.paid.push(doc.levels[levelID].slug);
-      }
-      else {
-        campaign.free.push(doc.levels[levelID].slug);
-      }
+      campaign.levelSlugs.push(doc.levels[levelID].slug);
     }
     campaigns.push(campaign);
   }
+
+  campaigns.sort(function (a, b) {
+    if (campaignSlugs.indexOf(a.slug) < campaignSlugs.indexOf(b.slug)){
+      return -1;
+    }
+    return 1;
+  });
   return campaigns;
 }
 
 function getPlaytimes(levelSlugs) {
+  // printjson(levelSlugs);
   var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
   var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"))
   var cursor = db['level.sessions'].find({
@@ -116,21 +92,49 @@ function getPlaytimes(levelSlugs) {
       {_id: {$gte: startObj}},
       {_id: {$lt: endObj}}
     ]
-  });
+  }, {heroConfig: 1, levelID: 1, playtime: 1});
 
   var playtimes = {};
   while (cursor.hasNext()) {
     var myDoc = cursor.next();
     var levelID = myDoc.levelID;
-    if (!playtimes[levelID]) playtimes[levelID] = [];
-    playtimes[levelID].push(myDoc.playtime);
+
+    if (!playtimes[levelID]) playtimes[levelID] = {campaign: [], course: []};
+    if (myDoc.heroConfig) {
+      playtimes[levelID].campaign.push(myDoc.playtime);
+    }
+    else {
+      playtimes[levelID].course.push(myDoc.playtime);
+    }
   }
+  // printjson(playtimes);
 
   var data = {};
   for (levelID in playtimes) {
-    var total = playtimes[levelID].reduce(function(a, b) {return a + b;});
-    data[levelID] = {count: playtimes[levelID].length, total: total};
-    data[levelID]['average'] = parseInt(total / playtimes[levelID].length);
+    var campaignTotal = 0;
+    var courseTotal = 0;
+    if (playtimes[levelID].campaign.length > 0) {
+      campaignTotal = playtimes[levelID].campaign.reduce(function(a, b) {return a + b;});
+    }
+    if (playtimes[levelID].course.length > 0) {
+      courseTotal = playtimes[levelID].course.reduce(function(a, b) {return a + b;});
+    }
+
+    var campaignAverage = parseInt(playtimes[levelID].campaign.length > 0 ? parseInt(campaignTotal / playtimes[levelID].campaign.length): 0);
+    var courseAverage = parseInt(playtimes[levelID].course.length > 0 ? parseInt(courseTotal / playtimes[levelID].course.length): 0);
+
+    data[levelID] = {
+      campaign: {
+        count: playtimes[levelID].campaign.length,
+        total: campaignTotal,
+        average: campaignAverage
+      },
+      course: {
+        count: playtimes[levelID].course.length,
+        total: courseTotal,
+        average: courseAverage
+      }
+    };
   }
   return data;
 }
diff --git a/scripts/analytics/mongodb/queries/campaignCompletionCounts.js b/scripts/analytics/mongodb/queries/campaignCompletionCounts.js
new file mode 100644
index 000000000..36ade5840
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/campaignCompletionCounts.js
@@ -0,0 +1,106 @@
+// Campaign completion counts
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+var courseCampaigns = ['intro', 'course-2', 'course-3', 'course-4'];
+var individualCampaigns = ['dungeon', 'forest', 'desert', 'mountain'];
+
+var scriptStartTime = new Date();
+var startDay = '2015-11-08';
+var endDay = '2015-11-15';  // Not inclusive
+
+log("Dates: " + startDay + " to " + endDay);
+
+var campaigns = getCampaigns(courseCampaigns);
+// var campaigns = getCampaigns(individualCampaigns);
+// printjson(campaigns);
+
+for (var i = 0; i < campaigns.length; i++) {
+  var campaign = campaigns[i];
+  print(campaign.slug);
+  print("Total\tCampaign\tCourse\tLevel");
+  var completionCounts = getCompletionCounts(campaign.levelSlugs);
+  for (var j = 0; j < campaign.levelSlugs.length; j++) {
+    var levelSlug = campaign.levelSlugs[j];
+    if (completionCounts[levelSlug]) {
+      print(completionCounts[levelSlug].campaign + completionCounts[levelSlug].course,
+        '\t', completionCounts[levelSlug].campaign,
+        '\t', completionCounts[levelSlug].course,
+        '\t', levelSlug);
+    }
+    else {
+      print(0, '\t', 0, '\t', 0, '\t', levelSlug);
+    }
+  }
+}
+
+log("Script runtime: " + (new Date() - scriptStartTime));
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getCampaigns(campaignSlugs) {
+  var campaigns = [];
+  var cursor = db.campaigns.find({slug: {$in: campaignSlugs}}, {slug: 1, levels: 1});
+  var allFree = 0;
+  var allpaid = 0;
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    if (doc.slug === 'auditions') continue;
+    var campaign = {slug: doc.slug, levelSlugs: []};
+    for (var levelID in doc.levels) {
+      campaign.levelSlugs.push(doc.levels[levelID].slug);
+    }
+    campaigns.push(campaign);
+  }
+
+  campaigns.sort(function (a, b) {
+    if (campaignSlugs.indexOf(a.slug) < campaignSlugs.indexOf(b.slug)){
+      return -1;
+    }
+    return 1;
+  });
+  return campaigns;
+}
+
+function getCompletionCounts(levelSlugs) {
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"))
+  var cursor = db['level.sessions'].find({
+    $and:
+    [
+      {"state.complete": true},
+      {levelID: {$in: levelSlugs}},
+      {_id: {$gte: startObj}},
+      {_id: {$lt: endObj}}
+    ]
+  }, {heroConfig: 1, levelID: 1});
+
+  var completionCounts = {};
+  while (cursor.hasNext()) {
+    var myDoc = cursor.next();
+    var levelID = myDoc.levelID;
+
+    if (!completionCounts[levelID]) completionCounts[levelID] = {campaign: 0, course: 0};
+    if (myDoc.heroConfig) {
+      completionCounts[levelID].campaign++;
+    }
+    else {
+      completionCounts[levelID].course++;
+    }
+  }
+
+  return completionCounts;
+}
diff --git a/scripts/analytics/mongodb/queries/coursesUxFunnels.js b/scripts/analytics/mongodb/queries/coursesUxFunnels.js
new file mode 100644
index 000000000..882cfc1ef
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/coursesUxFunnels.js
@@ -0,0 +1,357 @@
+// Print courses Ux funnel step counts
+
+// Usage:
+// Assumes analytics database is local, and Coco database is via command parameters
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+// TODO: generalize event formats in ux flow definitions
+// TODO: there are users jumping past course pageviews and directly to 'Started course prepaid purchase'
+
+var scriptStartTime = new Date();
+var logDB = new Mongo("localhost").getDB("analytics")
+
+var startDay = '2015-12-06';
+var endDay = '2015-12-15';  // Not inclusive
+var onlyUniqueEvents = false;
+
+var teacherFlows = [
+  [{pageview: ''}, {pageview: 'teachers'}, {pageview: 'courses/teachers'}, {event: 'Create new class'}, {event: 'Classroom started add students'}, {studentEvent: 'Joined classroom'}],
+  [{pageview: ''}, {pageview: 'teachers'}, {event: 'Started Signup'}, {event: 'Finished Signup'}, {pageview: 'courses/teachers'}, {event: 'Create new class'}, {event: 'Classroom started add students'}, {studentEvent: 'Joined classroom'}]
+];
+var purchaseFlows = [
+  [{pageviewRegex: /^courses\/\w{20}\w+$/ig, name: 'classroom details'}, {event: 'Classroom started enroll student'}, {pageviewRegex: /^courses\/purchase/ig, name: '/courses/purchase'}, {pageview: 'courses/purchase'}, {event: 'Started course prepaid purchase'}, {event: 'Finished course prepaid purchase'}, {event: 'Course assign student'}],
+  [{pageviewRegex: /^courses\/\w{20}\w+$/ig, name: 'classroom details'}, {pageviewRegex: /^courses\/purchase/ig, name: '/courses/purchase'}, {event: 'Started course prepaid purchase'}, {event: 'Finished course prepaid purchase'}, {event: 'Course assign student'}],
+  // TODO: This doesn't exclude a pitstop at /courses/:classroomID
+  [{pageview: 'courses/teachers'}, {pageviewRegex: /^courses\/purchase/ig, name: '/courses/purchase'}, {event: 'Started course prepaid purchase'}, {event: 'Finished course prepaid purchase'}, {event: 'Course assign student'}],
+  [{pageviewRegex: /^courses\/\w{20}\w+$/ig, name: 'classroom details'}, {event: 'Started course prepaid purchase'}, {event: 'Finished course prepaid purchase'}, {event: 'Course assign student'}],
+  [{event: 'Started course prepaid purchase'}, {event: 'Finished course prepaid purchase'}, {event: 'Course assign student'}]
+];
+
+var salesFlows = [
+  // /schools => /courses/teacher => Create new class => Classroom started add student => Student actually added (with join code delivery method)
+  // /schools => /courses/:classroomID => /courses/purchase => Started purchase => Completed purchase => Assigned student
+  // /schools => /courses/:classroomID => Enroll students modal => /courses/purchase => Started purchase => Completed purchase => Assigned student
+  // /schools => /courses/teachers => /courses/purchase => Started purchase => Completed purchase => Assigned student
+];
+
+var studentFlows = [
+  // TODO: exclude teachers
+  [{event: 'Joined classroom'}, {pageview: 'play/level/dungeons-of-kithgard'}]
+];
+
+print(startDay, 'up to', endDay);
+
+for (var i = 0; i < teacherFlows.length; i++) {
+  print('\tTeacher flow', i + 1);
+  var funnelEvents = getFunnelEvents(startDay, endDay, teacherFlows[i]);
+  for (var event in funnelEvents) {
+    print(funnelEvents[event], '\t', event);
+  }
+}
+
+for (var i = 0; i < purchaseFlows.length; i++) {
+  print('\tPurchase flow', i + 1);
+  var funnelEvents = getFunnelEvents(startDay, endDay, purchaseFlows[i]);
+  for (var event in funnelEvents) {
+    print(funnelEvents[event], '\t', event);
+  }
+}
+
+for (var i = 0; i < studentFlows.length; i++) {
+  print('\tStudent flow', i + 1);
+  var funnelEvents = getFunnelEvents(startDay, endDay, studentFlows[i]);
+  for (var event in funnelEvents) {
+    print(funnelEvents[event], '\t', event);
+  }
+}
+
+// var userTimelines = getUserTimelines(startDay, endDay, onlyUniqueEvents);
+// for (var user in userTimelines) {
+//   if (userTimelines[user].length < 50) continue;
+//   print('User', user)
+//   for (var i = 0; i < userTimelines[user].length; i++) {
+//     print(userTimelines[user][i].created, userTimelines[user][i].event);
+//   }
+//   // printjson(userTimelines[user]);
+//   // break;
+// }
+// // printjson(userTimelines);
+
+log("Script runtime: " + (new Date() - scriptStartTime));
+
+
+function getFunnelEvents(startDay, endDay, events) {
+
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"));
+
+  var normalEvents = [];
+  var pageviewEvents = [];
+  var pageviewRegexEvents = [];
+  var studentEvents = [];
+  for (var i = 0; i < events.length; i++) {
+    if (events[i].hasOwnProperty('event')) {
+      normalEvents.push(events[i].event);
+    }
+    else if (events[i].hasOwnProperty('pageview')) {
+      pageviewEvents.push(events[i].pageview);
+    }
+    else if (events[i].hasOwnProperty('pageviewRegex')) {
+      pageviewEvents.push(events[i].pageviewRegex);
+      pageviewRegexEvents.push({regex: events[i].pageviewRegex, name: events[i].name});
+    }
+    else if (events[i].hasOwnProperty('studentEvent')) {
+      studentEvents.push(events[i].studentEvent);
+    }
+    else {
+      print("Unknown event:");
+      printjson(events[i]);
+      return {};
+    }
+  }
+  // printjson(studentEvents);
+  // printjson(pageviewEvents);
+
+  var findQuery =  {$and: [
+    {_id: {$gte: startObj}},
+    {_id: {$lt: endObj}},
+    {$or: [
+      {event: {$in: normalEvents}},
+      {event: {$in: studentEvents}},
+      {$and: [
+        {event: 'Pageview'},
+        {'properties.url': {$in: pageviewEvents}}
+      ]}
+    ]}
+  ]};
+  // printjson(findQuery);
+  // return {};
+
+  var teacherEventsMap = {};
+  var teacherIDs = [];
+  var studentEventsMap = {};
+  var cursor = logDB.log.find(findQuery, {event: 1, properties: 1, user: 1});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var created = doc._id.getTimestamp().toISOString();
+    var event = doc.event;
+    if (event === 'Pageview') {
+      var matchedRegex = false;
+      for (var i = 0; i < pageviewRegexEvents.length; i++) {
+        if (doc.properties.url.match(pageviewRegexEvents[i].regex)) {
+          event += ' ' + pageviewRegexEvents[i].name
+          matchedRegex = true;
+          break;
+        }
+      }
+      if (!matchedRegex) {
+        event += ' /' + doc.properties.url;
+      }
+    }
+    var user = doc.user;
+
+    if (studentEvents.indexOf(doc.event) >= 0) {
+      if (!studentEventsMap[user]) studentEventsMap[user] = [];
+      studentEventsMap[user].push({
+        created: created,
+        event: '(student) ' + event
+      });
+    }
+    else {
+      if (!teacherEventsMap[user]) teacherEventsMap[user] = [];
+      teacherEventsMap[user].push({
+        created: created,
+        event: event
+      });
+      teacherIDs.push(ObjectId(user));
+    }
+  }
+  // printjson(studentEventsMap);
+  // print('Teachers:', Object.keys(teacherEventsMap).length);
+  // print('Students:', Object.keys(studentEventsMap).length);
+  // return {};
+
+  // Match student events to their teachers via classrooms
+  if (Object.keys(studentEventsMap).length > 0) {
+    // For all teacher classrooms
+    cursor = db.classrooms.find({ownerID: {$in: teacherIDs}}, {members: 1, ownerID: 1, });
+    while (cursor.hasNext()) {
+      var doc = cursor.next();
+      var members = doc.members || [];
+      var teacher = doc.ownerID.valueOf();
+
+      // For each classroom non-owner member
+      for (var i = 0; i < members.length; i++) {
+        if (members[i].valueOf() === doc.ownerID.valueOf()) continue;
+        var student = members[i].valueOf();
+        if (!studentEventsMap[student]) continue;
+
+        // Add student events to teacher events map
+        teacherEventsMap[teacher] = teacherEventsMap[teacher].concat(studentEventsMap[student]);
+      }
+    }
+  }
+
+  var userTimelineMap = {};
+  for (var user in teacherEventsMap) {
+    // Sort and remove contiguous duplicate events
+    teacherEventsMap[user].sort(function (a, b) { return a.created.localeCompare(b.created)});
+    userTimelineMap[user] = [];
+    var lastEvent = null;
+    for (var i = 0; i < teacherEventsMap[user].length; i++) {
+      if (teacherEventsMap[user][i].event !== lastEvent) {
+        userTimelineMap[user].push(teacherEventsMap[user][i]);
+      }
+      lastEvent = teacherEventsMap[user][i].event;
+    }
+  }
+  // printjson(userTimelineMap);
+
+  getCurrentEvent = function(eventData) {
+    var currentEvent = null;
+    if (eventData.hasOwnProperty('event')) {
+      currentEvent = eventData.event;
+    }
+    else if (eventData.hasOwnProperty('pageview')) {
+      currentEvent = 'Pageview /' + eventData.pageview;
+    }
+    else if (eventData.hasOwnProperty('pageviewRegex')) {
+      currentEvent = 'Pageview ' + eventData.name;
+    }
+    else if (eventData.hasOwnProperty('studentEvent')) {
+      currentEvent = '(student) ' + eventData.studentEvent;
+    }
+    return currentEvent;
+  }
+
+  var funnelEvents = {};
+  for (var user in userTimelineMap) {
+    var eventsIndex = 0;
+    var timelineIndex = 0;
+    while (eventsIndex < events.length && timelineIndex < userTimelineMap[user].length) {
+      var currentEvent = getCurrentEvent(events[eventsIndex]);
+      var currentTimeline = userTimelineMap[user][timelineIndex];
+      if (currentEvent === currentTimeline.event) {
+        if (!funnelEvents[currentEvent]) funnelEvents[currentEvent] = 0;
+        funnelEvents[currentTimeline.event]++;
+        eventsIndex++;
+      }
+      timelineIndex++;
+    }
+    while (eventsIndex < events.length) {
+      var currentEvent = getCurrentEvent(events[eventsIndex]);
+      if (!funnelEvents[currentEvent]) funnelEvents[currentEvent] = 0;
+      eventsIndex++;
+    }
+  }
+
+  return funnelEvents;
+}
+
+function getUserTimelines(startDay, endDay, onlyUniqueEvents) {
+
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"))
+  var cursor = logDB.log.find(
+    {$and: [
+      {_id: {$gte: startObj}},
+      {_id: {$lt: endObj}},
+      {$or: [
+        {event: {$in: [
+          'Hour of Code Begin',
+          'Started Signup',
+          'Classroom edit settings',
+          'Create new class',
+          'Classroom started add students',
+          'Classroom started enroll student',
+          'Classroom started enroll students',
+          'Classroom removed student'
+        ]}},
+        {$and: [
+          {event: 'Pageview'},
+          {$or: [
+            {'properties.url': {$regex: /hoc/ig}},
+            {'properties.url': {$regex: /teachers/ig}},
+            {'properties.url': {$regex: /courses/ig}}
+          ]}
+        ]}
+      ]}
+    ]});
+
+  var userEventMap = {};
+  var teacherEventsMap = {};
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var created = doc._id.getTimestamp().toISOString();
+    var event = doc.event;
+    if (event === 'Pageview') {
+      event += ' ' + doc.properties.url;
+    }
+    var user = doc.user.valueOf();
+
+    if (onlyUniqueEvents) {
+      if (!userEventMap[user]) userEventMap[user] = {};
+      if (!userEventMap[user][event]) {
+        userEventMap[user][event] = created;
+      }
+      else if (created.localeCompare(userEventMap[user][event]) < 0) {
+        // print('Found earlier event', user, event, userEventMap[user][event], created);
+        userEventMap[user][event] = created;
+      }
+    }
+    else {
+      if (!teacherEventsMap[user]) teacherEventsMap[user] = [];
+      teacherEventsMap[user].push({
+        created: created,
+        event: event
+      });
+    }
+  }
+
+  var userTimelineMap = {};
+  if (onlyUniqueEvents) {
+    for (var user in userEventMap) {
+      if (!userTimelineMap[user]) userTimelineMap[user] = [];
+      for (var event in userEventMap[user]) {
+        userTimelineMap[user].push({
+          created: userEventMap[user][event],
+          event: event
+        })
+      }
+      userTimelineMap[user].sort(function (a, b) { return a.created.localeCompare(b.created)});
+    }
+  }
+  else {
+    for (var user in teacherEventsMap) {
+      // Sort and remove contiguous duplicate events
+      teacherEventsMap[user].sort(function (a, b) { return a.created.localeCompare(b.created)});
+      userTimelineMap[user] = [];
+      var lastEvent = null;
+      for (var i = 0; i < teacherEventsMap[user].length; i++) {
+        if (teacherEventsMap[user][i].event !== lastEvent) {
+          userTimelineMap[user].push(teacherEventsMap[user][i]);
+        }
+        lastEvent = teacherEventsMap[user][i].event;
+      }
+    }
+  }
+  printjson(userTimelineMap);
+
+  return userTimelineMap;
+}
+
+// *** Helper functions ***
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js b/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js
new file mode 100644
index 000000000..bc22c10ef
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js
@@ -0,0 +1,429 @@
+// Insert per-day active class counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+  var analyticsStringCache = {};
+
+  var numDays = 40;
+  var daysInMonth = 30;
+
+  var startDay = new Date();
+  today = startDay.toISOString().substr(0, 10);
+  startDay.setUTCDate(startDay.getUTCDate() - numDays);
+  startDay = startDay.toISOString().substr(0, 10);
+
+  log("Today is " + today);
+  log("Start day is " + startDay);
+
+  log("Getting active class counts...");
+  var activeClassCounts = getActiveClassCounts(startDay);
+  // printjson(activeClassCounts);
+  log("Inserting active class counts...");
+  for (var event in activeClassCounts) {
+    for (var day in activeClassCounts[event]) {
+      if (today === day) continue; // Never save data for today because it's incomplete
+      insertEventCount(event, day, activeClassCounts[event][day]);
+    }
+  }
+
+  log("Script runtime: " + (new Date() - scriptStartTime));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getActiveClassCounts(startDay) {
+  // Tally active classes per day
+  // TODO: does not handle class membership changes
+
+  if (!startDay) return {};
+
+  var minGroupSize = 12;
+  var classes = {
+    'Active classes private clan': [],
+    'Active classes managed subscription': [],
+    'Active classes bulk subscription': [],
+    'Active classes prepaid': [],
+    'Active classes course free': [],
+    'Active classes course paid': []
+  };
+  var userPlayedMap = {};
+
+  // Private clans
+  // TODO: does not handle clan membership changes over time
+  var cursor = db.clans.find({$and: [{type: 'private'}, {$where: 'this.members.length >= ' + minGroupSize}]});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var members = doc.members.map(function(a) {
+      userPlayedMap[a.valueOf()] = [];
+      return a.valueOf();
+    });
+    classes['Active classes private clan'].push({
+      owner: doc.ownerID.valueOf(),
+      members: members,
+      activeDayMap: {}
+    });
+  }
+
+  // Managed subscriptions
+  // TODO: does not handle former recipients playing after sponsorship ends
+  var bulkSubGroups = {};
+  cursor = db.payments.find({$and: [{service: 'stripe'}, {$where: '!this.purchaser.equals(this.recipient)'}]});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var purchaser = doc.purchaser.valueOf();
+    if (!bulkSubGroups[purchaser]) bulkSubGroups[purchaser] = {};
+    bulkSubGroups[purchaser][doc.recipient.valueOf()] = true;
+  }
+  for (var purchaser in bulkSubGroups) {
+    if (Object.keys(bulkSubGroups[purchaser]).length >= minGroupSize) {
+      for (var member in bulkSubGroups[purchaser]) {
+        userPlayedMap[member] = [];
+      }
+      classes['Active classes managed subscription'].push({
+        owner: purchaser,
+        members: Object.keys(bulkSubGroups[purchaser]),
+        activeDayMap: {}
+      });
+    }
+  }
+
+  // Bulk subscriptions
+  bulkSubGroups = {};
+  cursor = db.payments.find({$and: [{service: 'external'}, {$where: '!this.purchaser.equals(this.recipient)'}]});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var purchaser = doc.purchaser.valueOf();
+    if (!bulkSubGroups[purchaser]) bulkSubGroups[purchaser] = {};
+    bulkSubGroups[purchaser][doc.recipient.valueOf()] = true;
+  }
+  for (var purchaser in bulkSubGroups) {
+    if (Object.keys(bulkSubGroups[purchaser]).length >= minGroupSize) {
+      for (var member in bulkSubGroups[purchaser]) {
+        userPlayedMap[member] = [];
+      }
+      classes['Active classes bulk subscription'].push({
+        owner: purchaser,
+        members: Object.keys(bulkSubGroups[purchaser]),
+        activeDayMap: {}
+      });
+    }
+  }
+
+  // Prepaids terminal_subscription
+  bulkSubGroups = {};
+  cursor = db.prepaids.find(
+    {$and: [{type: 'terminal_subscription'}, {$where: 'this.redeemers && this.redeemers.length >= ' + minGroupSize}]},
+    {creator: 1, type: 1, redeemers: 1}
+  );
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var owner = doc.creator.valueOf();
+    var members = [];
+    for (var i = 0 ; i < doc.redeemers.length; i++) {
+      userPlayedMap[doc.redeemers[i].userID.valueOf()] = [];
+      members.push(doc.redeemers[i].userID.valueOf());
+    }
+    classes['Active classes prepaid'].push({
+      owner: owner,
+      members: members,
+      activeDayMap: {}
+    });
+  }
+
+  // Classrooms
+  var classroomCourseInstancesMap = {};
+  cursor = db.course.instances.find(
+    {$where: 'this.members && this.members.length >= ' + minGroupSize},
+    {classroomID: 1, courseID: 1, members: 1, ownerID: 1}
+  );
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var owner = doc.ownerID.valueOf();
+    var classroom = doc.classroomID ? doc.classroomID.valueOf() : doc._id.valueOf();
+    var members = [];
+    for (var i = 0 ; i < doc.members.length; i++) {
+      userPlayedMap[doc.members[i].valueOf()] = [];
+      members.push(doc.members[i].valueOf());
+    }
+    if (!classroomCourseInstancesMap[classroom]) classroomCourseInstancesMap[classroom] = [];
+    classroomCourseInstancesMap[classroom].push({
+      course: doc.courseID.valueOf(),
+      owner: owner,
+      members: members,
+    });
+  }
+
+  // printjson(classroomCourseInstancesMap);
+
+  // Find all the started level events for our class members, for startDay - daysInMonth
+  var startDate = ISODate(startDay + "T00:00:00.000Z");
+  startDate.setUTCDate(startDate.getUTCDate() - daysInMonth);
+  var endDate = ISODate(startDay + "T00:00:00.000Z");
+  var todayDate = new Date(new Date().toISOString().substring(0, 10));
+  var startObj = objectIdWithTimestamp(startDate);
+  var queryParams = {$and: [
+    {_id: {$gte: startObj}},
+    {user: {$in: Object.keys(userPlayedMap)}},
+    {event: 'Started Level'}
+  ]};
+  cursor = logDB['log'].find(queryParams, {user: 1});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    userPlayedMap[doc.user].push(doc._id.getTimestamp());
+  }
+
+  // printjson(userPlayedMap);
+  // print(startDate, endDate, todayDate);
+
+  // Now we have a set of classes, and when users played
+  // For a given day, walk classes and find out how many members were active during the previous daysInMonth
+  while (endDate < todayDate) {
+    var endDay = endDate.toISOString().substring(0, 10);
+
+    // For each class
+    for (var event in classes) {
+      for (var i = 0; i < classes[event].length; i++) {
+
+        // For each member of current class
+        var activeMemberCount = 0;
+        for (var j = 0; j < classes[event][i].members.length; j++) {
+          var member = classes[event][i].members[j];
+
+          // Was member active during current timeframe?
+          if (userPlayedMap[member]) {
+            for (var k = 0; k < userPlayedMap[member].length; k++) {
+              if (userPlayedMap[member][k] > startDate && userPlayedMap[member][k] <= endDate) {
+                activeMemberCount++;
+                break;
+              }
+            }
+          }
+        }
+
+        // Classes active for a given day if has minGroupSize members, and at least 1/2 played in last daysInMonth days
+        if (activeMemberCount >= Math.round(classes[event][i].members.length / 2)) {
+          classes[event][i].activeDayMap[endDay] = true;
+        }
+      }
+    }
+    startDate.setUTCDate(startDate.getUTCDate() + 1);
+    endDate.setUTCDate(endDate.getUTCDate() + 1);
+  }
+
+  // Classrooms are processed differently because they could be free or paid active classes
+  var courseNameMap = {};
+  cursor = db.courses.find({}, {name: 1});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    courseNameMap[doc._id.valueOf()] = doc.name;
+  }
+
+  // For each classroom, check free and paid members separately
+  for (var classroom in classroomCourseInstancesMap) {
+    var freeMembers = {};
+    var paidMembers = {};
+    var owner = null;
+    for (var i = 0; i < classroomCourseInstancesMap[classroom].length; i++) {
+      var courseInstance = classroomCourseInstancesMap[classroom][i];
+      if (!owner) owner = courseInstance.owner;
+      for (var j = 0; j < courseInstance.members.length; j++) {
+        if (courseNameMap[courseInstance.course] === 'Introduction to Computer Science') {
+          freeMembers[courseInstance.members[j]] = true;
+        }
+        else {
+          paidMembers[courseInstance.members[j]] = true;
+        }
+      }
+    }
+
+    var freeClass = {
+      owner: owner,
+      members: Object.keys(freeMembers),
+      activeDayMap: {}
+    };
+    var paidClass = {
+      owner: owner,
+      members: Object.keys(paidMembers),
+      activeDayMap: {}
+    };
+
+    // print('Processing classroom', classroom, freeClass.members.length, paidClass.members.length);
+
+    startDate = ISODate(startDay + "T00:00:00.000Z");
+    startDate.setUTCDate(startDate.getUTCDate() - daysInMonth);
+    endDate = ISODate(startDay + "T00:00:00.000Z");
+    while (endDate < todayDate) {
+      var endDay = endDate.toISOString().substring(0, 10);
+
+      // For each paid member of current class
+      var paidActiveMemberCount = 0;
+      for (var j = 0; j < paidClass.members.length; j++) {
+        var member = paidClass.members[j];
+
+        // Was member active during current timeframe?
+        if (userPlayedMap[member]) {
+          for (var k = 0; k < userPlayedMap[member].length; k++) {
+            if (userPlayedMap[member][k] > startDate && userPlayedMap[member][k] <= endDate) {
+              paidActiveMemberCount++;
+              break;
+            }
+          }
+        }
+      }
+
+      // Classes active for a given day if has minGroupSize members, and at least 1/2 played in last daysInMonth days
+      if (paidClass.members.length > minGroupSize && paidActiveMemberCount >= Math.round(paidClass.members.length / 2)) {
+        // print('paid classroom', classroom, endDay);
+        paidClass.activeDayMap[endDay] = true;
+      }
+      else {
+        // For each free member of current class
+        var freeActiveMemberCount = 0;
+        for (var j = 0; j < freeClass.members.length; j++) {
+          var member = freeClass.members[j];
+
+          // Was member active during current timeframe?
+          if (userPlayedMap[member]) {
+            for (var k = 0; k < userPlayedMap[member].length; k++) {
+              if (userPlayedMap[member][k] > startDate && userPlayedMap[member][k] <= endDate) {
+                freeActiveMemberCount++;
+                break;
+              }
+            }
+          }
+        }
+
+        if (freeClass.members.length > minGroupSize && freeActiveMemberCount >= Math.round(freeClass.members.length / 2)) {
+          // print('free classroom', classroom, endDay);
+          freeClass.activeDayMap[endDay] = true;
+        }
+
+      }
+      startDate.setUTCDate(startDate.getUTCDate() + 1);
+      endDate.setUTCDate(endDate.getUTCDate() + 1);
+    }
+
+    // printjson(freeClass);
+    // printjson(paidClass);
+
+    classes['Active classes course free'].push(freeClass);
+    classes['Active classes course paid'].push(paidClass);
+  }
+
+  // printjson(classes['Active classes course paid']);
+
+  var activeClassCounts = {};
+  for (var event in classes) {
+    if (!activeClassCounts[event]) activeClassCounts[event] = {};
+    for (var i = 0; i < classes[event].length; i++) {
+      for (var endDay in classes[event][i].activeDayMap) {
+        if (!activeClassCounts[event][endDay]) activeClassCounts[event][endDay] = 0;
+        activeClassCounts[event][endDay]++;
+      }
+    }
+  }
+  return activeClassCounts;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertEventCount(event, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var filterID = getAnalyticsString('all');
+
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{d: day}, {e: eventID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count);
+    // }
+  }
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsActiveUsers.js b/scripts/analytics/mongodb/queries/insertAnalyticsActiveUsers.js
new file mode 100644
index 000000000..e8591f796
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsActiveUsers.js
@@ -0,0 +1,181 @@
+// Insert per-day active user counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+  var analyticsStringCache = {};
+
+  var numDays = 40;
+  var daysInMonth = 30;
+
+  var startDay = new Date();
+  today = startDay.toISOString().substr(0, 10);
+  startDay.setUTCDate(startDay.getUTCDate() - numDays);
+  startDay = startDay.toISOString().substr(0, 10);
+
+  var activeUserEvents = ['Finished Signup', 'Started Level'];
+
+  log("Today is " + today);
+  log("Start day is " + startDay);
+
+  log("Getting active user counts...");
+  var activeUserCounts = getActiveUserCounts(startDay, activeUserEvents);
+  // printjson(activeUserCounts);
+  log("Inserting active user counts...");
+  for (day in activeUserCounts) {
+    if (today === day) continue; // Never save data for today because it's incomplete
+    for (event in activeUserCounts[day]) {
+      insertEventCount(event, day, activeUserCounts[day][event]);
+    }
+  }
+
+  log("Script runtime: " + (new Date() - scriptStartTime));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getActiveUserCounts(startDay, activeUserEvents) {
+  // Counts active users per day
+  if (!startDay) return {};
+
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [
+    {_id: {$gte: startObj}},
+    {'event': {$in: activeUserEvents}}
+  ]};
+  var cursor = logDB['log'].find(queryParams);
+
+  var dayUserMap = {};
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var created = doc._id.getTimestamp().toISOString();
+    var day = created.substring(0, 10);
+    var user = doc.user;
+
+    if (!dayUserMap[day]) dayUserMap[day] = {};
+    dayUserMap[day][user] = true;
+  }
+
+  var activeUsersCounts = {};
+  var monthlyActives = [];
+  for (day in dayUserMap) {
+    activeUsersCounts[day] = {'Daily Active Users': Object.keys(dayUserMap[day]).length};
+    monthlyActives.push({day: day, users: dayUserMap[day]});
+  }
+
+  monthlyActives.sort(function (a, b) {return a.day.localeCompare(b.day);});
+
+  // Calculate monthly actives for each day, starting when we have enough data
+  for (var i = daysInMonth - 1; i < monthlyActives.length; i++) {
+    var monthUserMap = {};
+    for (var j = i - daysInMonth + 1; j <= i; j++) {
+      for (var user in monthlyActives[j].users) {
+        monthUserMap[user] = true;
+      }
+    }
+    activeUsersCounts[monthlyActives[i].day]['Monthly Active Users'] = Object.keys(monthUserMap).length;
+  }
+  return activeUsersCounts;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertEventCount(event, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var filterID = getAnalyticsString('all');
+
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{d: day}, {e: eventID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count);
+    // }
+  }
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsDrops.js b/scripts/analytics/mongodb/queries/insertAnalyticsDrops.js
new file mode 100644
index 000000000..e363cc61b
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsDrops.js
@@ -0,0 +1,234 @@
+// Insert per-day level completion drop counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+
+  var StringCache = function() {
+    this.lookup = {};
+    this.strings = [];
+  }
+  StringCache.prototype.get = function(index) {
+    return this.strings[parseInt(index)];
+  }
+  StringCache.prototype.set = function(str) {
+    if (!this.lookup.hasOwnProperty(str)) {
+      this.lookup[str] = this.strings.length;
+      this.strings.push(str);
+    }
+    return this.lookup[str];
+  }
+
+  var dayCache = new StringCache();
+  var eventCache = new StringCache();
+  var levelCache = new StringCache();
+  var userCache = new StringCache();
+
+  // TODO: convert to StringCache?
+  var analyticsStringCache = {};
+
+  // This needs to be enough days to encompass the start and finish events for most levels
+  var numDays = 20;
+  var levelCompletionFunnel = ['Started Level', 'Saw Victory'];
+
+  var today = new Date().toISOString().substr(0, 10);
+  log("Today is " + today);
+  log("numDays " + numDays);
+
+  var campaignLevelSlugs = getCampaignLevelSlugs();
+
+  log("Getting level drop counts...");
+  var levelDropCounts = getLevelDropCounts(numDays, levelCompletionFunnel, campaignLevelSlugs);
+  log("Inserting level drop counts...");
+  for (var level in levelDropCounts) {
+    for (var day in levelDropCounts[level]) {
+      if (today === dayCache.get(day)) continue; // Never save data for today because it's incomplete
+      // print('User Dropped', levelCache.get(level), dayCache.get(day), levelDropCounts[level][day]);
+      insertLevelEventCount(numDays, 'User Dropped', levelCache.get(level), dayCache.get(day), levelDropCounts[level][day]);
+    }
+  }
+
+  log("Script runtime: " + (new Date().getTime() - scriptStartTime.getTime()));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getLevelDropCounts(startDay, eventFunnel) {
+  // How many unique users did one of these events last?
+  // Return level/day breakdown
+
+  // Faster to request analytics db data in batches of days
+  var dayIncrement = 3;
+  var startDate = new Date();
+  startDate.setUTCDate(startDate.getUTCDate() - numDays);
+  var startDay = startDate.toISOString().substr(0, 10);
+  var endDate = new Date();
+  endDate.setUTCDate(endDate.getUTCDate() - numDays + dayIncrement);
+  var endDay = endDate.toISOString().substr(0, 10);
+
+  log("Start day is " + startDay);
+
+  var userProgression = {};
+  while (startDay < today) {
+    // log(startDay + " " + endDay);
+    var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+    var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"));
+
+    for (var i = 0; i < eventFunnel.length; i++) {
+      var queryParams = {$and: [{_id: {$gte: startObj}}, {_id: {$lt: endObj}}, {"event": eventFunnel[i]}, {'properties.levelID': {$in: campaignLevelSlugs}}]};
+      var selectParams = {event: 1, 'properties.levelID': 1, user: 1};
+      var cursor = logDB['log'].find(queryParams);
+      while (cursor.hasNext()) {
+        var doc = cursor.next();
+        if (!doc.properties || !doc.properties.levelID) continue;
+
+        var created = doc._id.getTimestamp().toISOString();
+        var event = eventCache.set(doc.event);
+        var level = levelCache.set(doc.properties.levelID);
+        var user = userCache.set(doc.user);
+
+        if (!userProgression[user]) userProgression[user] = [];
+        userProgression[user].push({
+          created: created,
+          event: event,
+          level: level
+        });
+      }
+    }
+    startDate.setUTCDate(startDate.getUTCDate() + dayIncrement);
+    startDay = startDate.toISOString().substr(0, 10);
+    endDate.setUTCDate(endDate.getUTCDate() + dayIncrement);
+    endDay = endDate.toISOString().substr(0, 10);
+  }
+
+  var levelDropCounts = {};
+  for (var user in userProgression) {
+    userProgression[user].sort(function (a,b) {return a.created < b.created ? -1 : 1});
+    var lastEvent = userProgression[user][userProgression[user].length - 1];
+    var level = lastEvent.level;
+    var day = dayCache.set(lastEvent.created.substring(0, 10));
+    if (!levelDropCounts[level]) levelDropCounts[level] = {};
+    if (!levelDropCounts[level][day]) levelDropCounts[level][day] = 0
+      levelDropCounts[level][day]++;
+  }
+  return levelDropCounts;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertLevelEventCount(event, level, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var levelID = getAnalyticsString(level);
+  var filterID = getAnalyticsString('all');
+
+  var startDate = new Date();
+  startDate.setUTCDate(startDate.getUTCDate() - numDays);
+  var startDay = startDate.toISOString().substr(0, 10);
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+
+  var queryParams = {$and: [{d: day}, {e: eventID}, {l: levelID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + level + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, l: levelID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count + " " + level);
+    // }
+  }
+}
+
+function getCampaignLevelSlugs() {
+  var campaignLevelSlugMap = {};
+  var cursor = db.campaigns.find({}, {levels: 1});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    for (var levelID in doc.levels) {
+      campaignLevelSlugMap[doc.levels[levelID].slug] = true;
+    }
+  }
+  return Object.keys(campaignLevelSlugMap);
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsHelps.js b/scripts/analytics/mongodb/queries/insertAnalyticsHelps.js
new file mode 100644
index 000000000..ec6b25f08
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsHelps.js
@@ -0,0 +1,184 @@
+// Insert per-day level completion drop counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+  var analyticsStringCache = {};
+
+  var numDays = 20;
+
+  var startDay = new Date();
+  today = startDay.toISOString().substr(0, 10);
+  startDay.setUTCDate(startDay.getUTCDate() - numDays);
+  startDay = startDay.toISOString().substr(0, 10);
+
+  var levelHelpEvents = ['Problem alert help clicked', 'Spell palette help clicked', 'Start help video'];
+
+  log("Today is " + today);
+  log("Start day is " + startDay);
+
+  log("Getting level help counts...");
+  var levelHelpCounts = getLevelHelpCounts(startDay, levelHelpEvents);
+  log("Inserting level help counts...");
+  for (level in levelHelpCounts) {
+    for (day in levelHelpCounts[level]) {
+      if (today === day) continue; // Never save data for today because it's incomplete
+      for (event in levelHelpCounts[level][day]) {
+        insertLevelEventCount(event, level, day, levelHelpCounts[level][day][event]);
+      }
+    }
+  }
+
+  log("Script runtime: " + (new Date() - scriptStartTime));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getLevelHelpCounts(startDay, events) {
+  if (!startDay || !events || events.length === 0) return {};
+
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{_id: {$gte: startObj}},{"event": {$in: events}}]};
+  var cursor = logDB['log'].find(queryParams);
+
+  // Map ordering: level, user, event, day
+  var userDataMap = {};
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var created = doc._id.getTimestamp().toISOString();
+    var day = created.substring(0, 10);
+    var event = doc.event;
+    var properties = doc.properties;
+    var user = doc.user;
+    var level;
+
+    if (properties.level) level = properties.level;
+    else if (properties.levelID) level = properties.levelID
+    else continue
+
+    if (!userDataMap[level]) userDataMap[level] = {};
+    if (!userDataMap[level][user]) userDataMap[level][user] = {};
+    if (!userDataMap[level][user][event] || userDataMap[level][user][event].localeCompare(day) > 0) {
+      // if (userDataMap[level][user][event]) log("Found earlier date " + level + " " + event + " " + user + " " + userDataMap[level][user][event] + " " + day);
+      userDataMap[level][user][event] = day;
+    }
+  }
+
+  // Data: level, day, event
+  var levelEventData = {};
+  for (level in userDataMap) {
+    for (user in userDataMap[level]) {
+      for (event in userDataMap[level][user]) {
+        var day = userDataMap[level][user][event];
+        if (!levelEventData[level]) levelEventData[level] = {};
+        if (!levelEventData[level][day]) levelEventData[level][day] = {};
+        if (!levelEventData[level][day][event]) levelEventData[level][day][event] = 0;
+        levelEventData[level][day][event]++;
+      }
+    }
+  }
+  return levelEventData;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertLevelEventCount(event, level, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var levelID = getAnalyticsString(level);
+  var filterID = getAnalyticsString('all');
+
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{d: day}, {e: eventID}, {l: levelID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + level + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, l: levelID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count + " " + level);
+    // }
+  }
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsLevelCompletions.js b/scripts/analytics/mongodb/queries/insertAnalyticsLevelCompletions.js
new file mode 100644
index 000000000..e9afc4356
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsLevelCompletions.js
@@ -0,0 +1,265 @@
+// Insert per-day level completion counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+// Completion rates (funnels) are calculated like Mixpanel
+// For a given date range, start count is the number of first steps (e.g. started a level)
+// Finish count for the same start date is how many unique users finished the remaining steps in the following ~30 days
+// https://mixpanel.com/help/questions/articles/how-are-funnels-calculated
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+
+  var StringCache = function() {
+    this.lookup = {};
+    this.strings = [];
+  }
+  StringCache.prototype.get = function(index) {
+    return this.strings[parseInt(index)];
+  }
+  StringCache.prototype.set = function(str) {
+    if (!this.lookup.hasOwnProperty(str)) {
+      this.lookup[str] = this.strings.length;
+      this.strings.push(str);
+    }
+    return this.lookup[str];
+  }
+
+  var dayCache = new StringCache();
+  var eventCache = new StringCache();
+  var levelCache = new StringCache();
+  var userCache = new StringCache();
+
+  // TODO: convert to StringCache?
+  var analyticsStringCache = {};
+
+  // This needs to be enough days to encompass the start and finish events for most levels
+  var numDays = 20;
+  var levelCompletionFunnel = ['Started Level', 'Saw Victory'];
+
+  var today = new Date().toISOString().substr(0, 10);
+  log("Today is " + today);
+  log("numDays " + numDays);
+
+  var campaignLevelSlugs = getCampaignLevelSlugs();
+
+  log("Getting level completion data...");
+  var levelCompletionData = getLevelFunnelData(numDays, levelCompletionFunnel, campaignLevelSlugs);
+  log("Inserting aggregated level completion data...");
+  for (var level in levelCompletionData) {
+    for (var day in levelCompletionData[level]) {
+      if (today === dayCache.get(day)) continue; // Never save data for today because it's incomplete
+      for (var event in levelCompletionData[level][day]) {
+        // print(numDays, eventCache.get(event), levelCache.get(level), dayCache.get(day), levelCompletionData[level][day][event]);
+        insertLevelEventCount(numDays, eventCache.get(event), levelCache.get(level), dayCache.get(day), levelCompletionData[level][day][event]);
+      }
+    }
+  }
+
+  log("Script runtime: " + (new Date().getTime() - scriptStartTime.getTime()));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getLevelFunnelData(numDays, eventFunnel, campaignLevelSlugs) {
+  // Faster to request analytics db data in batches of days
+  var dayIncrement = 3;
+  var startDate = new Date();
+  startDate.setUTCDate(startDate.getUTCDate() - numDays);
+  var startDay = startDate.toISOString().substr(0, 10);
+  var endDate = new Date();
+  endDate.setUTCDate(endDate.getUTCDate() - numDays + dayIncrement);
+  var endDay = endDate.toISOString().substr(0, 10);
+
+  log("Start day is " + startDay);
+
+  // Map ordering: level, user, event, day
+  var userDataMap = {};
+  while (startDay < today) {
+    // log(startDay + " " + endDay);
+    var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+    var endObj = objectIdWithTimestamp(ISODate(endDay + "T00:00:00.000Z"));
+
+    for (var i = 0; i < eventFunnel.length; i++) {
+      var queryParams = {$and: [{_id: {$gte: startObj}}, {_id: {$lt: endObj}}, {"event": eventFunnel[i]}, {'properties.levelID': {$in: campaignLevelSlugs}}]};
+      var selectParams = {event: 1, 'properties.levelID': 1, user: 1};
+      var cursor = logDB.log.find(queryParams, selectParams);
+      while (cursor.hasNext()) {
+        var doc = cursor.next();
+        if (!doc.properties || !doc.properties.levelID) continue;
+
+        var created = doc._id.getTimestamp().toISOString();
+        var dayStr = created.substring(0, 10);
+        var day = dayCache.set(dayStr);
+        var event = eventCache.set(doc.event);
+        var level = levelCache.set(doc.properties.levelID);
+        var user = userCache.set(doc.user);
+
+        if (!userDataMap[level]) userDataMap[level] = {};
+        if (!userDataMap[level][user]) userDataMap[level][user] = {};
+        if (!userDataMap[level][user][event] || dayCache.get(userDataMap[level][user][event]).localeCompare(dayStr) > 0) {
+          userDataMap[level][user][event] = day;
+        }
+      }
+    }
+    startDate.setUTCDate(startDate.getUTCDate() + dayIncrement);
+    startDay = startDate.toISOString().substr(0, 10);
+    endDate.setUTCDate(endDate.getUTCDate() + dayIncrement);
+    endDay = endDate.toISOString().substr(0, 10);
+  }
+
+  // Data: level, day, event
+  var levelFunnelData = {};
+  for (var level in userDataMap) {
+    for (var user in userDataMap[level]) {
+
+      // Find first event date
+      var funnelStartDay = null;
+      for (var event in userDataMap[level][user]) {
+        var day = userDataMap[level][user][event];
+        if (!levelFunnelData[level]) levelFunnelData[level] = {};
+        if (!levelFunnelData[level][day]) levelFunnelData[level][day] = {};
+        if (!levelFunnelData[level][day][event]) levelFunnelData[level][day][event] = 0;
+        if (eventFunnel[0] === eventCache.get(event)) {
+          // First event gets attributed to current date
+          levelFunnelData[level][day][event]++;
+          funnelStartDay = day;
+          break;
+        }
+      }
+
+      if (funnelStartDay) {
+        // Add remaining funnel steps/events to first step's date
+        for (var event in userDataMap[level][user]) {
+          if (!levelFunnelData[level][funnelStartDay][event]) levelFunnelData[level][funnelStartDay][event] = 0;
+          if (eventFunnel[0] !== eventCache.get(event)) levelFunnelData[level][funnelStartDay][event]++;
+        }
+        // Zero remaining funnel events
+        for (var i = 1; i < eventFunnel.length; i++) {
+          var event = eventCache.set(eventFunnel[i]);
+          if (!levelFunnelData[level][funnelStartDay][event]) levelFunnelData[level][funnelStartDay][event] = 0;
+        }
+      }
+      // Else no start event in this date range
+    }
+  }
+  return levelFunnelData;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertLevelEventCount(numDays, event, level, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var levelID = getAnalyticsString(level);
+  var filterID = getAnalyticsString('all');
+
+  var startDate = new Date();
+  startDate.setUTCDate(startDate.getUTCDate() - numDays);
+  var startDay = startDate.toISOString().substr(0, 10);
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+
+  var queryParams = {$and: [{d: day}, {e: eventID}, {l: levelID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + level + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, l: levelID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count + " " + level);
+    // }
+  }
+}
+
+function getCampaignLevelSlugs() {
+  var campaignLevelSlugMap = {};
+  var cursor = db.campaigns.find({}, {levels: 1});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    for (var levelID in doc.levels) {
+      campaignLevelSlugMap[doc.levels[levelID].slug] = true;
+    }
+  }
+  return Object.keys(campaignLevelSlugMap);
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js b/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js
new file mode 100644
index 000000000..cd00daed5
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js
@@ -0,0 +1,188 @@
+// Insert per-day recurring revenue counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+  var analyticsStringCache = {};
+
+  var numDays = 40;
+  var daysInMonth = 30;
+
+  var startDay = new Date();
+  today = startDay.toISOString().substr(0, 10);
+  startDay.setUTCDate(startDay.getUTCDate() - numDays);
+  startDay = startDay.toISOString().substr(0, 10);
+
+  log("Today is " + today);
+  log("Start day is " + startDay);
+
+  log("Getting recurring revenue counts...");
+  var recurringRevenueCounts = getRecurringRevenueCounts(startDay);
+  // printjson(recurringRevenueCounts);
+  log("Inserting recurring revenue counts...");
+  for (var event in recurringRevenueCounts) {
+    for (var day in recurringRevenueCounts[event]) {
+      if (today === day) continue; // Never save data for today because it's incomplete
+      insertEventCount(event, day, recurringRevenueCounts[event][day]);
+    }
+  }
+
+  log("Script runtime: " + (new Date() - scriptStartTime));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getRecurringRevenueCounts(startDay) {
+  if (!startDay) return {};
+
+  var dailyRevenueCounts = {};
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var cursor = db.payments.find({_id: {$gte: startObj}});
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var day;
+    if (doc.created) {
+      day = doc.created.substring(0, 10);
+    }
+    else {
+      day = doc._id.getTimestamp().toISOString().substring(0, 10);
+    }
+
+    if (doc.service === 'ios' || doc.service === 'bitcoin') continue;
+
+    if (doc.productID && doc.productID.indexOf('gems_') === 0) {
+      if (!dailyRevenueCounts['DRR gems']) dailyRevenueCounts['DRR gems'] = {};
+      if (!dailyRevenueCounts['DRR gems'][day]) dailyRevenueCounts['DRR gems'][day] = 0;
+      dailyRevenueCounts['DRR gems'][day] += doc.amount
+    }
+    else if (doc.productID === 'custom' || doc.service === 'external' || doc.service === 'invoice') {
+      if (!dailyRevenueCounts['DRR school sales']) dailyRevenueCounts['DRR school sales'] = {};
+      if (!dailyRevenueCounts['DRR school sales'][day]) dailyRevenueCounts['DRR school sales'][day] = 0;
+      dailyRevenueCounts['DRR school sales'][day] += doc.amount
+    }
+    else if (doc.service === 'stripe' && doc.gems === 42000) {
+      if (!dailyRevenueCounts['DRR yearly subs']) dailyRevenueCounts['DRR yearly subs'] = {};
+      if (!dailyRevenueCounts['DRR yearly subs'][day]) dailyRevenueCounts['DRR yearly subs'][day] = 0;
+      dailyRevenueCounts['DRR yearly subs'][day] += doc.amount
+    }
+    else if (doc.service === 'stripe') {
+      // Catches prepaids, and assumes all are type terminal_subscription
+      if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {};
+      if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0;
+      dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
+    }
+    else if (doc.service === 'paypal') {
+      if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {};
+      if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0;
+      dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
+    }
+    // else {
+    //   // printjson(doc);
+    //   // print(doc.service, doc.amount, doc.description, JSON.stringify(doc.stripe));
+    // }
+  }
+
+  return dailyRevenueCounts;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertEventCount(event, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var filterID = getAnalyticsString('all');
+
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{d: day}, {e: eventID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count);
+    // }
+  }
+}
diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsSubscriptions.js b/scripts/analytics/mongodb/queries/insertAnalyticsSubscriptions.js
new file mode 100644
index 000000000..e10382885
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/insertAnalyticsSubscriptions.js
@@ -0,0 +1,212 @@
+// Insert per-day subscription counts into analytics.perdays collection
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+try {
+  logDB = new Mongo("localhost").getDB("analytics")
+  var scriptStartTime = new Date();
+  var analyticsStringCache = {};
+
+  var numDays = 20;
+
+  var startDay = new Date();
+  today = startDay.toISOString().substr(0, 10);
+  startDay.setUTCDate(startDay.getUTCDate() - numDays);
+  startDay = startDay.toISOString().substr(0, 10);
+
+  log("Today is " + today);
+  log("Start day is " + startDay);
+
+  log("Getting level subscription counts...");
+  var levelSubscriptionCounts = getLevelSubscriptionCounts(startDay);
+  log("Inserting level subscription counts...");
+  for (level in levelSubscriptionCounts) {
+    for (day in levelSubscriptionCounts[level]) {
+      if (today === day) continue; // Never save data for today because it's incomplete
+      for (event in levelSubscriptionCounts[level][day]) {
+        insertLevelEventCount(event, level, day, levelSubscriptionCounts[level][day][event]);
+      }
+    }
+  }
+
+  log("Script runtime: " + (new Date() - scriptStartTime));
+}
+catch(err) {
+  log("ERROR: " + err);
+  printjson(err);
+}
+
+function getLevelSubscriptionCounts(startDay) {
+  // Counts subscriptions shown per day, only for events that have levels
+  // Subscription purchased event counts are attributed to last shown subscription modal event's day and level
+  if (!startDay) return {};
+
+  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [
+    {_id: {$gte: startObj}},
+    {$or: [
+      {$and: [{'event': 'Show subscription modal'}, {'properties.level': {$exists: true}}]},
+      {'event': 'Finished subscription purchase'}]
+    }
+  ]};
+  var cursor = logDB['log'].find(queryParams);
+
+  // Map ordering: user, event, level, day
+  // Map ordering: user, event, day
+  var userDataMap = {};
+  while (cursor.hasNext()) {
+    var doc = cursor.next();
+    var created = doc._id.getTimestamp().toISOString();
+    var day = created.substring(0, 10);
+    var event = doc.event;
+    var user = doc.user;
+
+    if (!userDataMap[user]) userDataMap[user] = {};
+
+    if (event === 'Show subscription modal') {
+      var level = doc.properties.level;
+
+      // TODO: This is for legacy data.
+      // TODO: Event tracking updated to use level slug for loading level view on ~1/21/15
+      level = slugify(level);
+
+      if (!userDataMap[user][event]) userDataMap[user][event] = {};
+      if (!userDataMap[user][event][level] || userDataMap[user][event][level].localeCompare(day) > 0) {
+        userDataMap[user][event][level] = day;
+      }
+    }
+    else if (event === 'Finished subscription purchase') {
+      if (!userDataMap[user][event] || userDataMap[user][event].localeCompare(day) > 0) {
+        userDataMap[user][event] = day;
+      }
+    } else {
+      continue;
+    }
+  }
+
+  // Data: level, day, event
+  var levelFunnelData = {};
+  for (user in userDataMap) {
+    if (userDataMap[user]['Show subscription modal']) {
+      var lastDay = null;
+      var lastLevel = null;
+      for (level in userDataMap[user]['Show subscription modal']) {
+        var day = userDataMap[user]['Show subscription modal'][level];
+        if (!lastDay || lastDay.localeCompare(day) > 0) {
+          lastDay = day;
+          lastLevel = level;
+        }
+        if (!levelFunnelData[level]) levelFunnelData[level] = {};
+        if (!levelFunnelData[level][day]) levelFunnelData[level][day] = {};
+        if (!levelFunnelData[level][day][event]) levelFunnelData[level][day]['Show subscription modal'] = 0;
+        levelFunnelData[level][day]['Show subscription modal']++;
+      }
+      if (lastDay && userDataMap[user]['Finished subscription purchase']) {
+        if (!levelFunnelData[lastLevel][lastDay]['Finished subscription purchase']) {
+          levelFunnelData[lastLevel][lastDay]['Finished subscription purchase'] = 0;
+        }
+        levelFunnelData[lastLevel][lastDay]['Finished subscription purchase']++;
+      }
+    }
+  }
+  return levelFunnelData;
+}
+
+
+// *** Helper functions ***
+
+function slugify(text)
+// https://gist.github.com/mathewbyrne/1280286
+{
+  return text.toString().toLowerCase()
+    .replace(/\s+/g, '-')           // Replace spaces with -
+    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
+    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
+    .replace(/^-+/, '')             // Trim - from start of text
+    .replace(/-+$/, '');            // Trim - from end of text
+}
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
+
+function objectIdWithTimestamp(timestamp) {
+  // Convert string date to Date object (otherwise assume timestamp is a date)
+  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
+  // Convert date object to hex seconds since Unix epoch
+  var hexSeconds = Math.floor(timestamp/1000).toString(16);
+  // Create an ObjectId with that hex timestamp
+  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
+  return constructedObjectId
+}
+
+function getAnalyticsString(str) {
+  if (analyticsStringCache[str]) return analyticsStringCache[str];
+
+  // Find existing string
+  var doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+
+  // Insert string
+  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
+  doc = {v: str};
+  while (true) {
+    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
+    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
+    doc._id = seq;
+    var results = db['analytics.strings'].insert(doc);
+    if (results.hasWriteError()) {
+      if ( results.writeError.code == 11000 /* dup key */ ) continue;
+      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
+    }
+    break;
+  }
+
+  // Find new string entry
+  doc = db['analytics.strings'].findOne({v: str});
+  if (doc) {
+    analyticsStringCache[str] = doc._id;
+    return analyticsStringCache[str];
+  }
+  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
+}
+
+function insertLevelEventCount(event, level, day, count) {
+  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
+  day = day.replace(/-/g, '');
+
+  var eventID = getAnalyticsString(event);
+  var levelID = getAnalyticsString(level);
+  var filterID = getAnalyticsString('all');
+
+  var startObj = objectIdWithTimestamp(new Date(startDay + "T00:00:00.000Z"));
+  var queryParams = {$and: [{d: day}, {e: eventID}, {l: levelID}, {f: filterID}]};
+  var doc = db['analytics.perdays'].findOne(queryParams);
+  if (doc && doc.c === count) return;
+
+  if (doc && doc.c !== count) {
+    // Update existing count, assume new one is more accurate
+    // log("Updating count in db for " + day + " " + event + " " + level + " " + doc.c + " => " + count);
+    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
+    if (results.nMatched !== 1 && results.nModified !== 1) {
+      log("ERROR: update event count failed");
+      printjson(results);
+    }
+  }
+  else {
+    var insertDoc = {d: day, e: eventID, l: levelID, f: filterID, c: count};
+    var results = db['analytics.perdays'].insert(insertDoc);
+    if (results.nInserted !== 1) {
+      log("ERROR: insert event failed");
+      printjson(results);
+      printjson(insertDoc);
+    }
+    // else {
+    //   log("Added " + day + " " + event + " " + count + " " + level);
+    // }
+  }
+}
diff --git a/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js b/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js
deleted file mode 100644
index 14fb5cf22..000000000
--- a/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js
+++ /dev/null
@@ -1,759 +0,0 @@
-// Insert per-day analytics into analytics.perdays collection
-
-// Usage:
-// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
-
-// Completion rates (funnels) are calculated like Mixpanel
-// For a given date range, start count is the number of first steps (e.g. started a level)
-// Finish count for the same start date is how many unique users finished the remaining steps in the following ~30 days
-// https://mixpanel.com/help/questions/articles/how-are-funnels-calculated
-
-// Drop count: last started or finished level event for a given unique user
-
-// TODO: Convert this to a node script so it can use proper libraries (e.g. slugify)
-
-try {
-  logDB = new Mongo("localhost").getDB("analytics")
-  var scriptStartTime = new Date();
-  var analyticsStringCache = {};
-
-  var numDays = 40;
-  var daysInMonth = 30;
-
-  var startDay = new Date();
-  today = startDay.toISOString().substr(0, 10);
-  startDay.setUTCDate(startDay.getUTCDate() - numDays);
-  startDay = startDay.toISOString().substr(0, 10);
-
-  var levelCompletionFunnel = ['Started Level', 'Saw Victory'];
-  var levelHelpEvents = ['Problem alert help clicked', 'Spell palette help clicked', 'Start help video'];
-  var activeUserEvents = ['Finished Signup', 'Started Level'];
-
-  log("Today is " + today);
-  log("Start day is " + startDay);
-  log("Funnel events are " + levelCompletionFunnel);
-
-  log("Getting level completion data...");
-  var levelCompletionData = getLevelFunnelData(startDay, levelCompletionFunnel);
-  log("Inserting aggregated level completion data...");
-  for (level in levelCompletionData) {
-    for (day in levelCompletionData[level]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      for (event in levelCompletionData[level][day]) {
-        insertLevelEventCount(event, level, day, levelCompletionData[level][day][event]);
-      }
-    }
-  }
-
-  log("Getting level drop counts...");
-  var levelDropCounts = getLevelDropCounts(startDay, levelCompletionFunnel);
-  log("Inserting level drop counts...");
-  for (level in levelDropCounts) {
-    for (day in levelDropCounts[level]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      insertLevelEventCount('User Dropped', level, day, levelDropCounts[level][day]);
-    }
-  }
-
-  log("Getting level help counts...");
-  var levelHelpCounts = getLevelHelpCounts(startDay, levelHelpEvents);
-  log("Inserting level help counts...");
-  for (level in levelHelpCounts) {
-    for (day in levelHelpCounts[level]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      for (event in levelHelpCounts[level][day]) {
-        insertLevelEventCount(event, level, day, levelHelpCounts[level][day][event]);
-      }
-    }
-  }
-
-  log("Getting level subscription counts...");
-  var levelSubscriptionCounts = getLevelSubscriptionCounts(startDay);
-  log("Inserting level subscription counts...");
-  for (level in levelSubscriptionCounts) {
-    for (day in levelSubscriptionCounts[level]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      for (event in levelSubscriptionCounts[level][day]) {
-        insertLevelEventCount(event, level, day, levelSubscriptionCounts[level][day][event]);
-      }
-    }
-  }
-
-  log("Getting active user counts...");
-  var activeUserCounts = getActiveUserCounts(startDay, activeUserEvents);
-  // printjson(activeUserCounts);
-  log("Inserting active user counts...");
-  for (day in activeUserCounts) {
-    if (today === day) continue; // Never save data for today because it's incomplete
-    for (event in activeUserCounts[day]) {
-      insertEventCount(event, day, activeUserCounts[day][event]);
-    }
-  }
-
-  log("Getting active class counts...");
-  var activeClassCounts = getActiveClassCounts(startDay);
-  // printjson(activeClassCounts);
-  log("Inserting active class counts...");
-  for (var event in activeClassCounts) {
-    for (var day in activeClassCounts[event]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      insertEventCount(event, day, activeClassCounts[event][day]);
-    }
-  }
-
-  log("Getting recurring revenue counts...");
-  var recurringRevenueCounts = getRecurringRevenueCounts(startDay);
-  // printjson(recurringRevenueCounts);
-  log("Inserting recurring revenue counts...");
-  for (var event in recurringRevenueCounts) {
-    for (var day in recurringRevenueCounts[event]) {
-      if (today === day) continue; // Never save data for today because it's incomplete
-      insertEventCount(event, day, recurringRevenueCounts[event][day]);
-    }
-  }
-
-  log("Script runtime: " + (new Date() - scriptStartTime));
-}
-catch(err) {
-  log("ERROR: " + err);
-  printjson(err);
-}
-
-
-// *** Helper functions ***
-
-function slugify(text)
-// https://gist.github.com/mathewbyrne/1280286
-{
-  return text.toString().toLowerCase()
-    .replace(/\s+/g, '-')           // Replace spaces with -
-    .replace(/[^\w\-]+/g, '')       // Remove all non-word chars
-    .replace(/\-\-+/g, '-')         // Replace multiple - with single -
-    .replace(/^-+/, '')             // Trim - from start of text
-    .replace(/-+$/, '');            // Trim - from end of text
-}
-
-function log(str) {
-  print(new Date().toISOString() + " " + str);
-}
-
-function objectIdWithTimestamp(timestamp) {
-  // Convert string date to Date object (otherwise assume timestamp is a date)
-  if (typeof(timestamp) == 'string') timestamp = new Date(timestamp);
-  // Convert date object to hex seconds since Unix epoch
-  var hexSeconds = Math.floor(timestamp/1000).toString(16);
-  // Create an ObjectId with that hex timestamp
-  var constructedObjectId = ObjectId(hexSeconds + "0000000000000000");
-  return constructedObjectId
-}
-
-function getAnalyticsString(str) {
-  if (analyticsStringCache[str]) return analyticsStringCache[str];
-
-  // Find existing string
-  var doc = db['analytics.strings'].findOne({v: str});
-  if (doc) {
-    analyticsStringCache[str] = doc._id;
-    return analyticsStringCache[str];
-  }
-
-  // Insert string
-  // http://docs.mongodb.org/manual/tutorial/create-an-auto-incrementing-field/#auto-increment-optimistic-loop
-  doc = {v: str};
-  while (true) {
-    var cursor = db['analytics.strings'].find({}, {_id: 1}).sort({_id: -1}).limit(1);
-    var seq = cursor.hasNext() ? cursor.next()._id + 1 : 1;
-    doc._id = seq;
-    var results = db['analytics.strings'].insert(doc);
-    if (results.hasWriteError()) {
-      if ( results.writeError.code == 11000 /* dup key */ ) continue;
-      else throw new Error("ERROR: Unexpected error inserting data: " + tojson(results));
-    }
-    break;
-  }
-
-  // Find new string entry
-  doc = db['analytics.strings'].findOne({v: str});
-  if (doc) {
-    analyticsStringCache[str] = doc._id;
-    return analyticsStringCache[str];
-  }
-  throw new Error("ERROR: Did not find analytics.strings insert for: " + str);
-}
-
-function getLevelFunnelData(startDay, eventFunnel) {
-  if (!startDay || !eventFunnel || eventFunnel.length === 0) return {};
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [{_id: {$gte: startObj}},{"event": {$in: eventFunnel}}]};
-  var cursor = logDB['log'].find(queryParams);
-
-  // Map ordering: level, user, event, day
-  var userDataMap = {};
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var created = doc._id.getTimestamp().toISOString();
-    var day = created.substring(0, 10);
-    var event = doc.event;
-    var properties = doc.properties;
-    var user = doc.user;
-    var level;
-
-    // TODO: Switch to properties.levelID for 'Saw Victory'
-    if (event === 'Saw Victory' && properties.level) level = slugify(properties.level);
-    else if (properties.levelID) level = properties.levelID
-    else continue
-
-    if (!userDataMap[level]) userDataMap[level] = {};
-    if (!userDataMap[level][user]) userDataMap[level][user] = {};
-    if (!userDataMap[level][user][event] || userDataMap[level][user][event].localeCompare(day) > 0) {
-      // if (userDataMap[level][user][event]) log("Found earlier date " + level + " " + event + " " + user + " " + userDataMap[level][user][event] + " " + day);
-      userDataMap[level][user][event] = day;
-    }
-  }
-
-  // Data: level, day, event
-  var levelFunnelData = {};
-  for (level in userDataMap) {
-    for (user in userDataMap[level]) {
-
-      // Find first event date
-      var funnelStartDay = null;
-      for (event in userDataMap[level][user]) {
-        var day = userDataMap[level][user][event];
-        if (!levelFunnelData[level]) levelFunnelData[level] = {};
-        if (!levelFunnelData[level][day]) levelFunnelData[level][day] = {};
-        if (!levelFunnelData[level][day][event]) levelFunnelData[level][day][event] = 0;
-        if (eventFunnel[0] === event) {
-          // First event gets attributed to current date
-          levelFunnelData[level][day][event]++;
-          funnelStartDay = day;
-          break;
-        }
-      }
-
-      if (funnelStartDay) {
-        // Add remaining funnel steps/events to first step's date
-        for (event in userDataMap[level][user]) {
-          if (!levelFunnelData[level][funnelStartDay][event]) levelFunnelData[level][funnelStartDay][event] = 0;
-          if (eventFunnel[0] != event) levelFunnelData[level][funnelStartDay][event]++;
-        }
-        // Zero remaining funnel events
-        for (var i = 1; i < eventFunnel.length; i++) {
-          var event = eventFunnel[i];
-          if (!levelFunnelData[level][funnelStartDay][event]) levelFunnelData[level][funnelStartDay][event] = 0;
-        }
-      }
-      // Else no start event in this date range
-    }
-  }
-  return levelFunnelData;
-}
-
-function getLevelDropCounts(startDay, events) {
-  // How many unique users did one of these events last?
-  // Return level/day breakdown
-
-  if (!startDay || !events || events.length === 0) return {};
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [{_id: {$gte: startObj}},{"event": {$in: events}}]};
-  var cursor = logDB['log'].find(queryParams);
-
-  var userProgression = {};
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var created = doc._id.getTimestamp().toISOString();
-    var event = doc.event;
-    var properties = doc.properties;
-    var user = doc.user;
-    var level;
-
-    // TODO: Switch to properties.levelID for 'Saw Victory'
-    if (event === 'Saw Victory' && properties.level) level = slugify(properties.level);
-    else if (properties.levelID) level = properties.levelID
-    else continue
-
-    if (!userProgression[user]) userProgression[user] = [];
-    userProgression[user].push({
-      created: created,
-      event: event,
-      level: level
-    });
-  }
-
-  var levelDropCounts = {};
-  for (user in userProgression) {
-    userProgression[user].sort(function (a,b) {return a.created < b.created ? -1 : 1});
-    var lastEvent = userProgression[user][userProgression[user].length - 1];
-    var level = lastEvent.level;
-    var day = lastEvent.created.substring(0, 10);
-    if (!levelDropCounts[level]) levelDropCounts[level] = {};
-    if (!levelDropCounts[level][day]) levelDropCounts[level][day] = 0
-      levelDropCounts[level][day]++;
-  }
-  return levelDropCounts;
-}
-
-function getLevelHelpCounts(startDay, events) {
-  if (!startDay || !events || events.length === 0) return {};
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [{_id: {$gte: startObj}},{"event": {$in: events}}]};
-  var cursor = logDB['log'].find(queryParams);
-
-  // Map ordering: level, user, event, day
-  var userDataMap = {};
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var created = doc._id.getTimestamp().toISOString();
-    var day = created.substring(0, 10);
-    var event = doc.event;
-    var properties = doc.properties;
-    var user = doc.user;
-    var level;
-
-    if (properties.level) level = properties.level;
-    else if (properties.levelID) level = properties.levelID
-    else continue
-
-    if (!userDataMap[level]) userDataMap[level] = {};
-    if (!userDataMap[level][user]) userDataMap[level][user] = {};
-    if (!userDataMap[level][user][event] || userDataMap[level][user][event].localeCompare(day) > 0) {
-      // if (userDataMap[level][user][event]) log("Found earlier date " + level + " " + event + " " + user + " " + userDataMap[level][user][event] + " " + day);
-      userDataMap[level][user][event] = day;
-    }
-  }
-
-  // Data: level, day, event
-  var levelEventData = {};
-  for (level in userDataMap) {
-    for (user in userDataMap[level]) {
-      for (event in userDataMap[level][user]) {
-        var day = userDataMap[level][user][event];
-        if (!levelEventData[level]) levelEventData[level] = {};
-        if (!levelEventData[level][day]) levelEventData[level][day] = {};
-        if (!levelEventData[level][day][event]) levelEventData[level][day][event] = 0;
-        levelEventData[level][day][event]++;
-      }
-    }
-  }
-  return levelEventData;
-}
-
-function getLevelSubscriptionCounts(startDay) {
-  // Counts subscriptions shown per day, only for events that have levels
-  // Subscription purchased event counts are attributed to last shown subscription modal event's day and level
-  if (!startDay) return {};
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [
-    {_id: {$gte: startObj}},
-    {$or: [
-      {$and: [{'event': 'Show subscription modal'}, {'properties.level': {$exists: true}}]},
-      {'event': 'Finished subscription purchase'}]
-    }
-  ]};
-  var cursor = logDB['log'].find(queryParams);
-
-  // Map ordering: user, event, level, day
-  // Map ordering: user, event, day
-  var userDataMap = {};
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var created = doc._id.getTimestamp().toISOString();
-    var day = created.substring(0, 10);
-    var event = doc.event;
-    var user = doc.user;
-
-    if (!userDataMap[user]) userDataMap[user] = {};
-
-    if (event === 'Show subscription modal') {
-      var level = doc.properties.level;
-
-      // TODO: This is for legacy data.
-      // TODO: Event tracking updated to use level slug for loading level view on ~1/21/15
-      level = slugify(level);
-
-      if (!userDataMap[user][event]) userDataMap[user][event] = {};
-      if (!userDataMap[user][event][level] || userDataMap[user][event][level].localeCompare(day) > 0) {
-        userDataMap[user][event][level] = day;
-      }
-    }
-    else if (event === 'Finished subscription purchase') {
-      if (!userDataMap[user][event] || userDataMap[user][event].localeCompare(day) > 0) {
-        userDataMap[user][event] = day;
-      }
-    } else {
-      continue;
-    }
-  }
-
-  // Data: level, day, event
-  var levelFunnelData = {};
-  for (user in userDataMap) {
-    if (userDataMap[user]['Show subscription modal']) {
-      var lastDay = null;
-      var lastLevel = null;
-      for (level in userDataMap[user]['Show subscription modal']) {
-        var day = userDataMap[user]['Show subscription modal'][level];
-        if (!lastDay || lastDay.localeCompare(day) > 0) {
-          lastDay = day;
-          lastLevel = level;
-        }
-        if (!levelFunnelData[level]) levelFunnelData[level] = {};
-        if (!levelFunnelData[level][day]) levelFunnelData[level][day] = {};
-        if (!levelFunnelData[level][day][event]) levelFunnelData[level][day]['Show subscription modal'] = 0;
-        levelFunnelData[level][day]['Show subscription modal']++;
-      }
-      if (lastDay && userDataMap[user]['Finished subscription purchase']) {
-        if (!levelFunnelData[lastLevel][lastDay]['Finished subscription purchase']) {
-          levelFunnelData[lastLevel][lastDay]['Finished subscription purchase'] = 0;
-        }
-        levelFunnelData[lastLevel][lastDay]['Finished subscription purchase']++;
-      }
-    }
-  }
-  return levelFunnelData;
-}
-
-function getActiveUserCounts(startDay, activeUserEvents) {
-  // Counts active users per day
-  if (!startDay) return {};
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [
-    {_id: {$gte: startObj}},
-    {'event': {$in: activeUserEvents}}
-  ]};
-  var cursor = logDB['log'].find(queryParams);
-
-  var dayUserMap = {};
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var created = doc._id.getTimestamp().toISOString();
-    var day = created.substring(0, 10);
-    var user = doc.user;
-
-    if (!dayUserMap[day]) dayUserMap[day] = {};
-    dayUserMap[day][user] = true;
-  }
-  // printjson(dayUserMap['2015-11-01']);
-
-  var activeUsersCounts = {};
-  var monthlyActives = [];
-  for (day in dayUserMap) {
-    activeUsersCounts[day] = {'Daily Active Users': Object.keys(dayUserMap[day]).length};
-    monthlyActives.push({day: day, users: dayUserMap[day]});
-  }
-
-  monthlyActives.sort(function (a, b) {return a.day.localeCompare(b.day);});
-
-  // Calculate monthly actives for each day, starting when we have enough data
-  for (var i = daysInMonth - 1; i < monthlyActives.length; i++) {
-    var monthUserMap = {};
-    for (var j = i - daysInMonth + 1; j <= i; j++) {
-      for (var user in monthlyActives[j].users) {
-        monthUserMap[user] = true;
-      }
-    }
-    activeUsersCounts[monthlyActives[i].day]['Monthly Active Users'] = Object.keys(monthUserMap).length;
-  }
-  return activeUsersCounts;
-}
-
-function getActiveClassCounts(startDay) {
-  // Tally active classes per day
-  // TODO: does not handle class membership changes
-
-  if (!startDay) return {};
-
-  var minGroupSize = 12;
-  var classes = {
-    'Active classes private clan': [],
-    'Active classes managed subscription': [],
-    'Active classes bulk subscription': [],
-    'Active classes prepaid': [],
-    'Active classes course': [],
-  };
-  var userPlayedMap = {};
-
-  // Private clans
-  // TODO: does not handle clan membership changes over time
-  var cursor = db.clans.find({$and: [{type: 'private'}, {$where: 'this.members.length >= ' + minGroupSize}]});
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var members = doc.members.map(function(a) {
-      userPlayedMap[a.valueOf()] = [];
-      return a.valueOf();
-    });
-    classes['Active classes private clan'].push({
-      owner: doc.ownerID.valueOf(),
-      members: members,
-      activeDayMap: {}
-    });
-  }
-
-  // Managed subscriptions
-  // TODO: does not handle former recipients playing after sponsorship ends
-  var bulkSubGroups = {};
-  cursor = db.payments.find({$and: [{service: 'stripe'}, {$where: '!this.purchaser.equals(this.recipient)'}]});
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var purchaser = doc.purchaser.valueOf();
-    if (!bulkSubGroups[purchaser]) bulkSubGroups[purchaser] = {};
-    bulkSubGroups[purchaser][doc.recipient.valueOf()] = true;
-  }
-  for (var purchaser in bulkSubGroups) {
-    if (Object.keys(bulkSubGroups[purchaser]).length >= minGroupSize) {
-      for (var member in bulkSubGroups[purchaser]) {
-        userPlayedMap[member] = [];
-      }
-      classes['Active classes managed subscription'].push({
-        owner: purchaser,
-        members: Object.keys(bulkSubGroups[purchaser]),
-        activeDayMap: {}
-      });
-    }
-  }
-
-  // Bulk subscriptions
-  bulkSubGroups = {};
-  cursor = db.payments.find({$and: [{service: 'external'}, {$where: '!this.purchaser.equals(this.recipient)'}]});
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var purchaser = doc.purchaser.valueOf();
-    if (!bulkSubGroups[purchaser]) bulkSubGroups[purchaser] = {};
-    bulkSubGroups[purchaser][doc.recipient.valueOf()] = true;
-  }
-  for (var purchaser in bulkSubGroups) {
-    if (Object.keys(bulkSubGroups[purchaser]).length >= minGroupSize) {
-      for (var member in bulkSubGroups[purchaser]) {
-        userPlayedMap[member] = [];
-      }
-      classes['Active classes bulk subscription'].push({
-        owner: purchaser,
-        members: Object.keys(bulkSubGroups[purchaser]),
-        activeDayMap: {}
-      });
-    }
-  }
-
-  // Prepaids terminal_subscription & course
-  bulkSubGroups = {};
-  cursor = db.prepaids.find(
-    {$and: [{type: {$in: ['terminal_subscription', 'course']}}, {$where: 'this.redeemers && this.redeemers.length >= ' + minGroupSize}]},
-    {creator: 1, type: 1, redeemers: 1}
-  );
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var owner = doc.creator.valueOf();
-    var members = [];
-    for (var i = 0 ; i < doc.redeemers.length; i++) {
-      userPlayedMap[doc.redeemers[i].userID.valueOf()] = [];
-      members.push(doc.redeemers[i].userID.valueOf());
-    }
-    var event = doc.type == 'terminal_subscription' ? 'Active classes prepaid' : 'Active classes course';
-    classes[event].push({
-      owner: owner,
-      members: members,
-      activeDayMap: {}
-    });
-  }
-
-  // printjson(classes);
-
-  // TODO: classrooms
-
-  // Find all the started level events for our class members, for startDay - daysInMonth
-  var startDate = ISODate(startDay + "T00:00:00.000Z");
-  startDate.setUTCDate(startDate.getUTCDate() - daysInMonth);
-  var endDate = ISODate(startDay + "T00:00:00.000Z");
-  var todayDate = new Date(new Date().toISOString().substring(0, 10));
-  var startObj = objectIdWithTimestamp(startDate);
-  var queryParams = {$and: [
-    {_id: {$gte: startObj}},
-    {event: 'Started Level'},
-    {user: {$in: Object.keys(userPlayedMap)}}
-  ]};
-  cursor = logDB['log'].find(queryParams, {user: 1});
-  // cursor = db['level.sessions'].find({$and: [{creator: {$in: Object.keys(userPlayedMap)}}, {changed: {$gte: startDate}}]}, {creator: 1, changed: 1});
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    userPlayedMap[doc.user].push(doc._id.getTimestamp());
-  }
-
-  // printjson(userPlayedMap);
-  // print(startDate, endDate, todayDate);
-
-  // Now we have a set of classes, and when users played
-  // For a given day, walk classes and find out how many members were active during the previous daysInMonth
-  while (endDate < todayDate) {
-    var endDay = endDate.toISOString().substring(0, 10);
-
-    // For each class
-    for (var event in classes) {
-      for (var i = 0; i < classes[event].length; i++) {
-
-        // For each member of current class
-        var activeMemberCount = 0;
-        for (var j = 0; j < classes[event][i].members.length; j++) {
-          var member = classes[event][i].members[j];
-
-          // Was member active during current timeframe?
-          if (userPlayedMap[member]) {
-            for (var k = 0; k < userPlayedMap[member].length; k++) {
-              if (userPlayedMap[member][k] > startDate && userPlayedMap[member][k] <= endDate) {
-                activeMemberCount++;
-                break;
-              }
-            }
-          }
-        }
-
-        // Classes active for a given day if has minGroupSize members, and at least 1/2 played in last daysInMonth days
-        if (activeMemberCount >= Math.round(classes[event][i].members.length / 2)) {
-          classes[event][i].activeDayMap[endDay] = true;
-        }
-      }
-    }
-    startDate.setUTCDate(startDate.getUTCDate() + 1);
-    endDate.setUTCDate(endDate.getUTCDate() + 1);
-  }
-
-  var activeClassCounts = {};
-  for (var event in classes) {
-    if (!activeClassCounts[event]) activeClassCounts[event] = {};
-    for (var i = 0; i < classes[event].length; i++) {
-      for (var endDay in classes[event][i].activeDayMap) {
-        if (!activeClassCounts[event][endDay]) activeClassCounts[event][endDay] = 0;
-        activeClassCounts[event][endDay]++;
-      }
-    }
-  }
-  return activeClassCounts;
-}
-
-function getRecurringRevenueCounts(startDay) {
-  if (!startDay) return {};
-
-  var dailyRevenueCounts = {};
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var cursor = db.payments.find({_id: {$gte: startObj}});
-  while (cursor.hasNext()) {
-    var doc = cursor.next();
-    var day;
-    if (doc.created) {
-      day = doc.created.substring(0, 10);
-    }
-    else {
-      day = doc._id.getTimestamp().toISOString().substring(0, 10);
-    }
-
-    if (doc.service === 'ios' || doc.service === 'bitcoin') continue;
-
-    if (doc.productID && doc.productID.indexOf('gems_') === 0) {
-      if (!dailyRevenueCounts['DRR gems']) dailyRevenueCounts['DRR gems'] = {};
-      if (!dailyRevenueCounts['DRR gems'][day]) dailyRevenueCounts['DRR gems'][day] = 0;
-      dailyRevenueCounts['DRR gems'][day] += doc.amount
-    }
-    else if (doc.productID === 'custom' || doc.service === 'external' || doc.service === 'invoice') {
-      if (!dailyRevenueCounts['DRR school sales']) dailyRevenueCounts['DRR school sales'] = {};
-      if (!dailyRevenueCounts['DRR school sales'][day]) dailyRevenueCounts['DRR school sales'][day] = 0;
-      dailyRevenueCounts['DRR school sales'][day] += doc.amount
-    }
-    else if (doc.service === 'stripe' && doc.gems === 42000) {
-      if (!dailyRevenueCounts['DRR yearly subs']) dailyRevenueCounts['DRR yearly subs'] = {};
-      if (!dailyRevenueCounts['DRR yearly subs'][day]) dailyRevenueCounts['DRR yearly subs'][day] = 0;
-      dailyRevenueCounts['DRR yearly subs'][day] += doc.amount
-    }
-    else if (doc.service === 'stripe') {
-      // Catches prepaids, and assumes all are type terminal_subscription
-      if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {};
-      if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0;
-      dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
-    }
-    else if (doc.service === 'paypal') {
-      if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {};
-      if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0;
-      dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
-    }
-    // else {
-    //   // printjson(doc);
-    //   // print(doc.service, doc.amount, doc.description, JSON.stringify(doc.stripe));
-    // }
-  }
-
-  return dailyRevenueCounts;
-}
-
-function insertEventCount(event, day, count) {
-  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
-  day = day.replace(/-/g, '');
-
-  var eventID = getAnalyticsString(event);
-  var filterID = getAnalyticsString('all');
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [{d: day}, {e: eventID}, {f: filterID}]};
-  var doc = db['analytics.perdays'].findOne(queryParams);
-  if (doc && doc.c === count) return;
-
-  if (doc && doc.c !== count) {
-    // Update existing count, assume new one is more accurate
-    // log("Updating count in db for " + day + " " + event + " " + doc.c + " => " + count);
-    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
-    if (results.nMatched !== 1 && results.nModified !== 1) {
-      log("ERROR: update event count failed");
-      printjson(results);
-    }
-  }
-  else {
-    var insertDoc = {d: day, e: eventID, f: filterID, c: count};
-    var results = db['analytics.perdays'].insert(insertDoc);
-    if (results.nInserted !== 1) {
-      log("ERROR: insert event failed");
-      printjson(results);
-      printjson(insertDoc);
-    }
-    // else {
-    //   log("Added " + day + " " + event + " " + count);
-    // }
-  }
-}
-
-function insertLevelEventCount(event, level, day, count) {
-  // analytics.perdays schema in server/analytics/AnalyticsPeryDay.coffee
-  day = day.replace(/-/g, '');
-
-  var eventID = getAnalyticsString(event);
-  var levelID = getAnalyticsString(level);
-  var filterID = getAnalyticsString('all');
-
-  var startObj = objectIdWithTimestamp(ISODate(startDay + "T00:00:00.000Z"));
-  var queryParams = {$and: [{d: day}, {e: eventID}, {l: levelID}, {f: filterID}]};
-  var doc = db['analytics.perdays'].findOne(queryParams);
-  if (doc && doc.c === count) return;
-
-  if (doc && doc.c !== count) {
-    // Update existing count, assume new one is more accurate
-    // log("Updating count in db for " + day + " " + event + " " + level + " " + doc.c + " => " + count);
-    var results = db['analytics.perdays'].update(queryParams, {$set: {c: count}});
-    if (results.nMatched !== 1 && results.nModified !== 1) {
-      log("ERROR: update event count failed");
-      printjson(results);
-    }
-  }
-  else {
-    var insertDoc = {d: day, e: eventID, l: levelID, f: filterID, c: count};
-    var results = db['analytics.perdays'].insert(insertDoc);
-    if (results.nInserted !== 1) {
-      log("ERROR: insert event failed");
-      printjson(results);
-      printjson(insertDoc);
-    }
-    // else {
-    //   log("Added " + day + " " + event + " " + count + " " + level);
-    // }
-  }
-}
diff --git a/scripts/analytics/mongodb/queries/managedSubscriptionsTotal.js b/scripts/analytics/mongodb/queries/managedSubscriptionsTotal.js
new file mode 100644
index 000000000..e27d57978
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/managedSubscriptionsTotal.js
@@ -0,0 +1,22 @@
+// Print out total managed subscriptions
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+var scriptStartTime = new Date();
+
+var cursor = db.users.find({anonymous: false}, {stripe: 1});
+var total = 0;
+while (cursor.hasNext()) {
+    var doc = cursor.next();
+    if (doc.stripe && doc.stripe.recipients) {
+        total += doc.stripe.recipients.length;
+    }
+}
+print(total);
+
+log("Script runtime: " + (new Date() - scriptStartTime));
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
diff --git a/scripts/analytics/mongodb/queries/userEnrollmentCounts.js b/scripts/analytics/mongodb/queries/userEnrollmentCounts.js
new file mode 100644
index 000000000..362e3e24a
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/userEnrollmentCounts.js
@@ -0,0 +1,60 @@
+// Print out user enrollment counts by type
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+// NOTE: A given user only contributes to one enrollment type (e.g. used a paid, then not counted for trial)
+
+var scriptStartTime = new Date();
+var startDay = '2015-11-24';
+var endDay = '2015-12-15';  // Not inclusive
+var startDate = ISODate(startDay + "T00:00:00.000Z");
+var endDate = ISODate(endDay + "T00:00:00.000Z");
+print(startDay, 'up to', endDay);
+
+var userEnrollmentsMap = {};
+db.prepaids.find({type: 'course'}, {creator: 1, 'properties': 1, redeemers: 1}).forEach(function (doc) {
+  var userID = doc.creator.valueOf();
+  if (!userEnrollmentsMap[userID]) userEnrollmentsMap[userID] = {endDate: 0, paid: 0, trial: 0};
+
+  if (doc.redeemers) {
+    for (var i = 0; i < doc.redeemers.length; i++) {
+      if (doc.redeemers[i].date < startDate || doc.redeemers[i].date > endDate) continue;
+      if (doc.properties && doc.properties.endDate) {
+        userEnrollmentsMap[userID].endDate++;
+      }
+      else if (doc.properties && doc.properties.trialRequestID) {
+        userEnrollmentsMap[userID].trial++;
+      }
+      else {
+        userEnrollmentsMap[userID].paid++;
+      }
+    }
+  }
+});
+
+var enrollmentCounts = {endDate: 0, paid: 0, trial: 0};
+for (var userID in userEnrollmentsMap) {
+  if (userEnrollmentsMap[userID].paid > 0) {
+    enrollmentCounts.paid += userEnrollmentsMap[userID].paid;
+  }
+  else if (userEnrollmentsMap[userID].endDate > 0) {
+    enrollmentCounts.endDate += userEnrollmentsMap[userID].endDate;
+  }
+  else {
+    enrollmentCounts.trial += userEnrollmentsMap[userID].trial;
+  }
+}
+
+print(enrollmentCounts.paid, '\tPaid enrollments used');
+print(enrollmentCounts.endDate, '\tTerminal enrollments used');
+print(enrollmentCounts.trial, '\tTrial enrollments used');
+
+log("Script runtime: " + (new Date() - scriptStartTime));
+
+
+// *** Helper functions ***
+
+function log(str) {
+  print(new Date().toISOString() + " " + str);
+}
diff --git a/scripts/buildSchoolGraph.coffee b/scripts/buildSchoolGraph.coffee
index c87687a2a..a14ca7636 100644
--- a/scripts/buildSchoolGraph.coffee
+++ b/scripts/buildSchoolGraph.coffee
@@ -5,6 +5,8 @@ mongoose = require 'mongoose'
 log = require 'winston'
 async = require 'async'
 moment = require 'moment'
+fs = require 'fs'
+exec = require('child_process').exec
 
 ### SET UP ###
 do (setupLodash = this) ->
@@ -35,6 +37,7 @@ nextPrompt = (users, question, userToSchool, suggestions) ->
   unless userToSchool
     return console.log('Done.') or process.exit() unless [userToSchool, suggestions] = findUserToSchool users
   question ?= formatSuggestions userToSchool, suggestions
+  openTSV userToSchool, suggestions
   prompt question, (answer) ->
     answer = answer.trim()
     return console.log('Bye.') or process.exit() if answer in ['q', 'quit']
@@ -86,6 +89,7 @@ finalizePrompt = (userToSchool, suggestions, schoolName, users) ->
       nextPrompt remainingUsers
 
 findNumbers = (answer, max) ->
+  answer = answer.replace /,/g, ' '
   numbers = (parseInt(d, 10) for d in (' ' + answer + ' ').replace(/ /g, '  ').match(/ (\d+) /g) ? [])
   ranges = answer.match(/(\d+-\d+)/g) or []
   for range in ranges
@@ -97,11 +101,14 @@ findNumbers = (answer, max) ->
       console.log "Incorrect number #{number} higher than max: #{max}"
   numbers
 
-formatUser = (user, relativeToUser) ->
-  # TODO: replace date string with relative time since signup compared to target user, and actually make suggestions based on students that signed up at almost the same time
-  props = _.pick(user, ['name', 'emailLower', 'ageRange', 'dateCreated', 'lastLevel', 'points', 'referrer', 'hourOfCode'])
-  props.dateCreated = if relativeToUser then moment(props.dateCreated).from(relativeToUser.dateCreated) else moment(props.dateCreated).fromNow()
-  _.values(props).join('  ')
+formatUser = (user, relativeToUser, separator='  ') ->
+  values = []
+  for key in ['name', 'emailLower', 'ageRange', 'dateCreated', 'lastLevel', 'points', 'referrer', 'hourOfCode']
+    val = user[key]
+    if key is 'dateCreated'
+      val = if relativeToUser then moment(val).from(relativeToUser.dateCreated) else moment(val).fromNow()
+    values.push val
+  values.join separator
 
 formatSuggestions = (userToSchool, suggestions) ->
   suggestionPrompts = ("#{_.str.rpad(i + 1, 3)}  #{_.str.rpad(s.schoolName, 50)} #{s.reasons.length} #{if s.reasons.length > 1 then 'Matches' else 'Match'}: #{s.reasons.join(', ')}\tfrom user: #{formatUser(s.user, userToSchool)}" for s, i in suggestions).join('\n')
@@ -113,10 +120,22 @@ formatSuggestions = (userToSchool, suggestions) ->
   Choose a number, type a name, enter to skip, or q to quit.
   > """
 
+openTSV = (userToSchool, suggestions) ->
+  header = ['#', 'School Name', 'Matches', 'Name', 'Email', 'Age', 'Signup', 'Last Level', 'Points', 'Referrer', 'HoC'].join '\t'
+  rows = [[0, userToSchool.schoolName, '', formatUser(userToSchool, null, '\t')].join '\t']
+  for s, i in suggestions
+    matches = s.reasons.length + ' ' + if s.reasons.length > 1 then 'Matches' else 'Match' + ': ' + s.reasons.join(', ')
+    rows.push [i + 1, s.schoolName, matches, formatUser(s.user, userToSchool, '\t')].join '\t'
+  contents = [header].concat(rows).join('\n') + '\n'
+  path = "#{process.env.HOME}/Downloads/#{userToSchool.emailLower}.tsv"
+  fs.writeFile path, contents, {flags: 'w'}, (err) ->
+    console.log 'Error writing school suggestions TSV:', err if err
+    exec "open -a /Applications/Numbers.app #{path}"
+
 checkedTopGroups = {}
 findUserToSchool = (users) ->
   # We find the top user from the top group that we can make the most reasoned suggestions about what the school name would be.
-  [bestTarget, bestTargetSuggestions, mostReasons, bestGroup] = [null, [], 0, null]
+  [bestTarget, bestTargetSuggestions, bestSuggestionsScore, bestGroup] = [null, [], 0, null]
   for field, groups of topGroups
     for nextLargestGroup in groups when not checkedTopGroups[nextLargestGroup]
       possibleTargets = userCategories[field][nextLargestGroup]
@@ -125,7 +144,7 @@ findUserToSchool = (users) ->
       alreadyDone = false
       for schoolName in schoolNames when schoolName?.length > 10 and /,.+,/.test schoolName  # Long enough school name with location info (two commas)
         sharedCount = _.filter(possibleTargets, schoolName: schoolName).length
-        if sharedCount > 0.5 * possibleTargets.length
+        if sharedCount > 20 and sharedCount > 0.25 * possibleTargets.length
           console.log 'Already done', schoolName, sharedCount, possibleTargets.length, 'for', field, nextLargestGroup
           alreadyDone = true
       continue if alreadyDone
@@ -134,22 +153,11 @@ findUserToSchool = (users) ->
       for i in [0 ... nSamples]
         target = possibleTargets[Math.floor i * possibleTargets.length / (nSamples + 1)]
         suggestions = findSuggestions target
-        reasons = _.reduce suggestions, ((sum, suggestion) ->
-          for suggestion in suggestions
-            for reason in suggestion.reasons
-              sum += switch reason
-                when 'Course instances' then 50
-                when 'IP' then 40
-                when 'Name' then 30
-                when 'Referrer' then 20
-                when 'Domain' then (if getDomain(target) is 'cps.edu' then 1 else 10)
-                when 'Clans' then 0.01
-          sum
-        ), 0
-        if reasons > mostReasons
+        suggestionsScore = scoreSuggestions suggestions, target
+        if suggestionsScore > bestSuggestionsScore
           bestTarget = target
           bestTargetSuggestions = suggestions
-          mostReasons = reasons
+          bestSuggestionsScore = suggestionsScore
           bestGroup = nextLargestGroup
       break
   checkedTopGroups[bestGroup] = true
@@ -157,6 +165,7 @@ findUserToSchool = (users) ->
 
 findSuggestions = (target) ->
   # Look for other users with the same IP, course instances, clans, or similar school names or non-common shared email domains.
+  # TODO: Actually make suggestions based on students that signed up at almost the same time
   suggestions = []
   t0 = new Date()
   if debugging then console.log '  Checking suggestions for', target.emailLower, target.schoolName, (new Date()) - t0
@@ -205,17 +214,32 @@ findSuggestions = (target) ->
       else
         suggestions.push schoolName: otherUser.schoolName, reasons: [reason], user: otherUser
   if debugging then console.log '    Done checking referrer', (new Date()) - t0
-  suggestions = _.sortBy suggestions, 'schoolName'
-  suggestions = _.sortBy suggestions, (s) -> -s.reasons.length
+  suggestions = _.sortBy suggestions, (s) -> (s.schoolName or '').toLowerCase()
+  suggestions = _.sortBy suggestions, (s) -> -scoreSuggestions [s], target
   return suggestions
 
+scoreSuggestions = (suggestions, target) ->
+  _.reduce suggestions, ((sum, suggestion) ->
+    for suggestion in suggestions
+      for reason in suggestion.reasons
+        sum += switch reason
+          when 'Course instances' then 150
+          when 'IP' then 40
+          when 'Referrer' then 20
+          when 'Name' then 15
+          when 'Domain' then (if getDomain(target) in ['cps.edu', 'mynewcaneyisd.org', 'fsusd.org', 'edison.k12.nj.us'] then 1 else 10)
+          when 'Clans' then 0.01
+    sum
+  ), 0
+
 userCategories = {}
 topGroups = {}
 usersCategorized = {}
 
 sortUsers = (users) ->
   users = _.sortBy users, (u) -> -u.points
-  users = _.sortBy users, ['schoolName', 'lastIP']
+  users = _.sortBy users, 'lastIP'
+  users = _.sortBy users, (u) -> (u.schoolName or '').toLowerCase()
   for field in ['courseInstances', 'lastIP', 'schoolName', 'domain', 'clans', 'referrer']
     userCategories[field] = categorizeUsers users, field
     topGroups[field] = _.sortBy _.keys(userCategories[field]), (key) -> -userCategories[field][key].length
diff --git a/scripts/vagrant/fillMongo.sh b/scripts/vagrant/fillMongo.sh
index feb401064..ca7e5c437 100755
--- a/scripts/vagrant/fillMongo.sh
+++ b/scripts/vagrant/fillMongo.sh
@@ -4,11 +4,14 @@ mkdir -p /vagrant/temp
 cd /vagrant/temp
 rm -f dump.tar.gz
 rm -rf dump
-wget http://analytics.codecombat.com:8080/dump.tar.gz
-tar xzvf dump.tar.gz --no-same-owner
-mongorestore --drop
+echo "Downloading mongo dump file..."
+wget --no-verbose http://analytics.codecombat.com:8080/dump.tar.gz
+tar xzf dump.tar.gz --no-same-owner
+echo "Restoring mongo dump file..."
+mongorestore --quiet --drop
 if [ -d /vagrant/temp/backup ]
 then
+  echo "Restoring mongo backup..."
   cd /vagrant/temp/backup
-  mongorestore
+  mongorestore --quiet
 fi
diff --git a/scripts/vagrant/provision.sh b/scripts/vagrant/provision.sh
index c6910d11d..513f62665 100644
--- a/scripts/vagrant/provision.sh
+++ b/scripts/vagrant/provision.sh
@@ -1,6 +1,13 @@
-#!/bin/bash
+#!/bin/bash -e
 # Original content copyright (c) 2014 dpen2000 licensed under the MIT license
 
+# some defaults
+DISTRO="trusty"
+NODE_VERSION="0.10" # 0.10 | 0.12 | 4.x | 5.x
+
+# inform apt that there's no user to answer interactive questions
+export DEBIAN_FRONTEND=noninteractive
+
 # Set default ulimits
 cat <<- EOF > /tmp/limits.conf
 * soft nofile 10000
@@ -9,23 +16,44 @@ EOF
 sudo mv /tmp/limits.conf /etc/security/limits.conf
 sudo chown root:root /etc/security/limits.conf
 
-#Install required software
-sudo apt-get -y update
-sudo apt-get -y install python-software-properties git
-sudo add-apt-repository -y ppa:chris-lea/node.js
-sudo apt-get -y update
-sudo apt-get -y install nodejs
-sudo apt-get -y install g++ make
-mkdir /vagrant/node_modules
-sudo mkdir /node_modules
-sudo chown vagrant:vagrant /node_modules
-sudo mount -o bind /node_modules /vagrant/node_modules
-cd /vagrant
-npm install
-sudo npm install -g geoip-lite
-bower install --allow-root
+# install prerequisites
+curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
+echo "deb https://deb.nodesource.com/node_${NODE_VERSION} ${DISTRO} main
+deb-src https://deb.nodesource.com/node_${NODE_VERSION} ${DISTRO} main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
-sudo apt-get -y update
-sudo apt-get -y install mongodb-org
-bash /vagrant/scripts/vagrant/fillMongo.sh
+
+echo "updating apt sources..."
+sudo apt-get -qq update
+
+echo "installing prerequisites..."
+sudo apt-get -qqy install --no-install-recommends git g++ make curl wget
+
+# install node.js
+echo "installing node.js..."
+sudo apt-get -qqy install nodejs
+echo "upgrading npm..."
+sudo npm install -g npm@latest # upgrade npm
+sudo npm install -g geoip-lite
+sudo npm install -g bower
+
+# bind /vagrant/node_modules so that it does not leak through to the host file system
+# which triggers symlink and path size issues on Windows hosts
+mkdir -p /vagrant/node_modules
+sudo mkdir -p /node_modules
+sudo chown vagrant:vagrant /node_modules
+sudo mount --bind /node_modules /vagrant/node_modules
+cd /vagrant
+
+# install npm modules
+echo "installing modules..."
+npm install
+bower install
+
+# install mongo
+echo "installing mongodb..."
+sudo apt-get -qqy install --no-install-recommends mongodb-org
+
+# populate mongo
+echo "populating mongodb..."
+exec /vagrant/scripts/vagrant/fillMongo.sh
diff --git a/server/analytics/analytics_perday_handler.coffee b/server/analytics/analytics_perday_handler.coffee
index 6998dd0ca..640b57876 100644
--- a/server/analytics/analytics_perday_handler.coffee
+++ b/server/analytics/analytics_perday_handler.coffee
@@ -30,7 +30,9 @@ class AnalyticsPerDayHandler extends Handler
       'Active classes managed subscription',
       'Active classes bulk subscription',
       'Active classes prepaid',
-      'Active classes course']
+      'Active classes course free',
+      'Active classes course paid'
+    ]
 
     AnalyticsString.find({v: {$in: events}}).exec (err, documents) =>
       return @sendDatabaseError(res, err) if err
diff --git a/server/commons/Handler.coffee b/server/commons/Handler.coffee
index f696be4bc..883318ed2 100644
--- a/server/commons/Handler.coffee
+++ b/server/commons/Handler.coffee
@@ -192,6 +192,9 @@ module.exports = class Handler
       hasLimit = false
       try
         for own key, val of req.query.conditions
+          numeric = parseInt val, 10
+          if not _.isNaN(numeric) and numeric + '' is val
+            val = numeric
           query = query[key](val)
           hasLimit ||= key is 'limit'
       catch e
@@ -246,7 +249,7 @@ module.exports = class Handler
         criteria = {}
         criteria[if nonVersioned then '_id' else 'original'] = mongoose.Types.ObjectId(id)
         @modelClass.findOne(criteria, project).sort(sort).exec (err, document) ->
-          return done(err) if err
+          return callback err if err
           callback(null, document?.toObject() or null)
 
     funcs = {}
diff --git a/server/courses/course_instance_handler.coffee b/server/courses/course_instance_handler.coffee
index 6ce2d0361..e28bf2835 100644
--- a/server/courses/course_instance_handler.coffee
+++ b/server/courses/course_instance_handler.coffee
@@ -51,7 +51,6 @@ CourseInstanceHandler = class CourseInstanceHandler extends Handler
       if courseInstance
         console.log 'already made a course instance'
       return @sendSuccess(res, courseInstance) if courseInstance
-      console.log 'making a new course instance'
       courseInstance = new CourseInstance({
         courseID: courseID
         members: [req.user.get('_id')]
diff --git a/server/levels/systems/LevelSystem.coffee b/server/levels/systems/LevelSystem.coffee
index 75398fb4b..1d3cb53af 100644
--- a/server/levels/systems/LevelSystem.coffee
+++ b/server/levels/systems/LevelSystem.coffee
@@ -16,7 +16,7 @@ LevelSystemSchema.index(
   {
     name: 'search index'
     sparse: true
-    weights: {description: 1, name: 1, name: 1}
+    weights: {description: 1, name: 1}
     default_language: 'english'
     'language_override': 'searchLanguage'
     'textIndexVersion': 2
diff --git a/server/levels/thangs/thang_type_handler.coffee b/server/levels/thangs/thang_type_handler.coffee
index 56f06b625..246c6b4bd 100644
--- a/server/levels/thangs/thang_type_handler.coffee
+++ b/server/levels/thangs/thang_type_handler.coffee
@@ -80,4 +80,16 @@ ThangTypeHandler = class ThangTypeHandler extends Handler
     else
       super(arguments...)
 
+  # Was testing to see what the bandwidth savings are here. This would need more logic to determine whether we need the vector data, probably with extra info from the client.
+  #formatEntity: (req, document) ->
+  #  result = document?.toObject()
+  #  if false and result.prerenderedSpriteSheetData and result.raw and result.kind isnt 'Mark'
+  #    if false and result.spriteType is 'singular'  # Wait, do we need animations and containers for Singular?
+  #      result.raw = shapes: {}, containers: {}, animations: {}
+  #    else
+  #      result.raw.shapes = {}
+  #      #result.raw.containers = {}  # Segmented and Singular sprites currently look at the bounds of containers to determine scale sometimes; wonder if we need that, or if containers are ever even that big
+  #  result
+
+
 module.exports = new ThangTypeHandler()
diff --git a/server/models/Mandate.coffee b/server/models/Mandate.coffee
new file mode 100644
index 000000000..6aed3246b
--- /dev/null
+++ b/server/models/Mandate.coffee
@@ -0,0 +1,5 @@
+mongoose = require('mongoose')
+config = require '../../server_config'
+MandateSchema = new mongoose.Schema {}, {strict: false, read: config.mongo.readpref}
+
+module.exports = mongoose.model('mandate', MandateSchema)
diff --git a/server/models/Product.coffee b/server/models/Product.coffee
new file mode 100644
index 000000000..25da01e7d
--- /dev/null
+++ b/server/models/Product.coffee
@@ -0,0 +1,5 @@
+mongoose = require('mongoose')
+config = require '../../server_config'
+ProductSchema = new mongoose.Schema({}, {strict: false,read:config.mongo.readpref})
+
+module.exports = mongoose.model('product', ProductSchema)
diff --git a/server/payments/payment_handler.coffee b/server/payments/payment_handler.coffee
index a70f0c630..fd5da1677 100644
--- a/server/payments/payment_handler.coffee
+++ b/server/payments/payment_handler.coffee
@@ -1,4 +1,5 @@
 Payment = require './Payment'
+Product = require '../models/Product'
 User = require '../users/User'
 Handler = require '../commons/Handler'
 {handlers} = require '../commons/mapping'
@@ -11,30 +12,6 @@ request = require 'request'
 async = require 'async'
 apple_utils = require '../lib/apple_utils'
 
-products = {
-  'gems_5': {
-    amount: 499
-    gems: 5000
-    id: 'gems_5'
-  }
-
-  'gems_10': {
-    amount: 999
-    gems: 11000
-    id: 'gems_10'
-  }
-
-  'gems_20': {
-    amount: 1999
-    gems: 25000
-    id: 'gems_20'
-  }
-
-  'custom': {
-    # amount expected in request body
-    id: 'custom'
-  }
-}
 
 PaymentHandler = class PaymentHandler extends Handler
   modelClass: Payment
@@ -134,33 +111,34 @@ PaymentHandler = class PaymentHandler extends Handler
 
         payment = @makeNewInstance(req)
         payment.set 'service', 'ios'
-        product = products[transaction.product_id]
-
-        payment.set 'amount', product.amount
-        payment.set 'gems', product.gems
-        payment.set 'ios', {
-          transactionID: transactionID
-          rawReceipt: receipt
-          localPrice: localPrice
-        }
-
-        validation = @validateDocumentInput(payment.toObject())
-        if validation.valid is false
-          @logPaymentError(req, 'Invalid apple payment object.')
-          return @sendBadInputError(res, validation.errors)
-
-        payment.save((err) =>
-          if err
-            @logPaymentError(req, 'Apple payment save error.'+err)
-            return @sendDatabaseError(res, err)
-          @incrementGemsFor(req.user, product.gems, (err) =>
+        Product.findOne({name: transaction.product_id}).exec (err, product) =>
+          return @sendDatabaseError(res, err) if err
+          return @sendNotFoundError(res) if not product
+          payment.set 'amount', product.get('amount')
+          payment.set 'gems', product.get('gems')
+          payment.set 'ios', {
+            transactionID: transactionID
+            rawReceipt: receipt
+            localPrice: localPrice
+          }
+  
+          validation = @validateDocumentInput(payment.toObject())
+          if validation.valid is false
+            @logPaymentError(req, 'Invalid apple payment object.')
+            return @sendBadInputError(res, validation.errors)
+  
+          payment.save((err) =>
             if err
-              @logPaymentError(req, 'Apple incr db error.'+err)
+              @logPaymentError(req, 'Apple payment save error.'+err)
               return @sendDatabaseError(res, err)
-            @sendPaymentHipChatMessage user: req.user, payment: payment
-            @sendCreated(res, @formatEntity(req, payment))
+            @incrementGemsFor(req.user, product.get('gems'), (err) =>
+              if err
+                @logPaymentError(req, 'Apple incr db error.'+err)
+                return @sendDatabaseError(res, err)
+              @sendPaymentHipChatMessage user: req.user, payment: payment
+              @sendCreated(res, @formatEntity(req, payment))
+            )
           )
-        )
       )
     )
 
@@ -203,7 +181,6 @@ PaymentHandler = class PaymentHandler extends Handler
 
 
   beginStripePayment: (req, res, timestamp, productID) ->
-    product = products[productID]
 
     async.parallel([
       ((callback) ->
@@ -218,6 +195,10 @@ PaymentHandler = class PaymentHandler extends Handler
           charge = _.find recentCharges.data, (c) -> c.metadata.timestamp is timestamp
           callback(null, charge)
         )
+      ),
+      ((callback) ->
+        Product.findOne({name: productID}).exec (err, product) =>
+          callback(err, product)
       )
     ],
 
@@ -225,7 +206,10 @@ PaymentHandler = class PaymentHandler extends Handler
         if err
           @logPaymentError(req, 'Stripe async load db error. '+err)
           return @sendDatabaseError(res, err)
-        [payment, charge] = results
+        [payment, charge, product] = results
+        
+        if not product
+          return @sendNotFoundError(res, 'could not find product with id '+productID)
 
         if not (payment or charge)
           # Proceed normally from the beginning
@@ -236,7 +220,7 @@ PaymentHandler = class PaymentHandler extends Handler
           @recordStripeCharge(req, res, charge)
 
         else
-          return @sendSuccess(res, @formatEntity(req, payment)) if product.id is 'custom'
+          return @sendSuccess(res, @formatEntity(req, payment)) if product.get('name') is 'custom'
 
           # Charged Stripe and recorded it. Recalculate gems to make sure credited the purchase.
           @recalculateGemsFor(req.user, (err) =>
@@ -250,7 +234,7 @@ PaymentHandler = class PaymentHandler extends Handler
     )
 
   chargeStripe: (req, res, product) ->
-    amount = parseInt product.amount ? req.body.amount
+    amount = parseInt product.get('amount') ? req.body.amount
     return @sendError(res, 400, "Invalid amount.") if isNaN(amount)
 
     stripe.charges.create({
@@ -258,9 +242,9 @@ PaymentHandler = class PaymentHandler extends Handler
       currency: 'usd'
       customer: req.user.get('stripe')?.customerID
       metadata: {
-        productID: product.id
+        productID: product.get('name')
         userID: req.user._id + ''
-        gems: product.gems
+        gems: product.get('gems')
         timestamp: parseInt(req.body.stripe?.timestamp)
         description: req.body.description
       }
diff --git a/server/payments/subscription_handler.coffee b/server/payments/subscription_handler.coffee
index 321010903..e4cb53d88 100644
--- a/server/payments/subscription_handler.coffee
+++ b/server/payments/subscription_handler.coffee
@@ -15,20 +15,10 @@ User = require '../users/User'
 {getSponsoredSubsAmount} = require '../../app/core/utils'
 StripeUtils = require '../lib/stripe_utils'
 moment = require 'moment'
+Product = require '../models/Product'
 
 recipientCouponID = 'free'
 
-# TODO: rename this to avoid collisions with 'subscriptions' variables
-subscriptions = {
-  basic: {
-    gems: 3500
-    amount: 999 # For calculating incremental quantity before sub creation
-  }
-  year_sale: {
-    amount: 9900
-  }
-}
-
 class SubscriptionHandler extends Handler
   logSubscriptionError: (user, msg) ->
     console.warn "Subscription Error: #{user.get('slug')} (#{user._id}): '#{msg}'"
@@ -149,51 +139,56 @@ class SubscriptionHandler extends Handler
           if err
             @logSubscriptionError(user, "Purchase year sale Stripe cancel subscription error: #{JSON.stringify(err)}")
             return @sendDatabaseError(res, err)
-          metadata =
-            type: req.body.type
-            userID: req.user._id + ''
-            gems: subscriptions.basic.gems * 12
-            timestamp: parseInt(req.body.stripe?.timestamp)
-            description: req.body.description
-
-          StripeUtils.createCharge req.user, subscriptions.year_sale.amount, metadata, (err, charge) =>
-            if err
-              @logSubscriptionError(req.user, "Purchase year sale create charge: #{JSON.stringify(err)}")
-              return @sendDatabaseError(res, err)
-
-            StripeUtils.createPayment req.user, charge, (err, payment) =>
+            
+          Product.findOne({name: 'year_subscription'}).exec (err, product) =>
+            return @sendDatabaseError(res, err) if err
+            return @sendNotFoundError(res, 'year_subscription product not found') if not product
+            
+            metadata =
+              type: req.body.type
+              userID: req.user._id + ''
+              gems: product.get('gems')
+              timestamp: parseInt(req.body.stripe?.timestamp)
+              description: req.body.description
+  
+            StripeUtils.createCharge req.user, product.get('amount'), metadata, (err, charge) =>
               if err
-                @logSubscriptionError(req.user, "Purchase year sale create payment: #{JSON.stringify(err)}")
+                @logSubscriptionError(req.user, "Purchase year sale create charge: #{JSON.stringify(err)}")
                 return @sendDatabaseError(res, err)
-
-              # Add terminal subscription to User with extensions for existing subscriptions
-              stripeInfo = _.cloneDeep(req.user.get('stripe') ? {})
-              endDate = new Date()
-              if stripeSubscriptionPeriodEndDate
-                endDate = stripeSubscriptionPeriodEndDate
-              else if _.isString(stripeInfo.free) and new Date() < new Date(stripeInfo.free)
-                endDate = new Date(stripeInfo.free)
-              endDate.setUTCFullYear(endDate.getUTCFullYear() + 1)
-              stripeInfo.free = endDate.toISOString().substring(0, 10)
-              req.user.set('stripe', stripeInfo)
-
-              # Add year's worth of gems to User
-              purchased = _.clone(req.user.get('purchased'))
-              purchased ?= {}
-              purchased.gems ?= 0
-              purchased.gems += parseInt(charge.metadata.gems)
-              req.user.set('purchased', purchased)
-
-              req.user.save (err, user) =>
+  
+              StripeUtils.createPayment req.user, charge, (err, payment) =>
                 if err
-                  @logSubscriptionError(req.user, "User save error: #{JSON.stringify(err)}")
+                  @logSubscriptionError(req.user, "Purchase year sale create payment: #{JSON.stringify(err)}")
                   return @sendDatabaseError(res, err)
-                try
-                  msg = "Year subscription purchased by #{req.user.get('email')} #{req.user.id}"
-                  hipchat.sendHipChatMessage msg, ['tower']
-                catch error
-                  @logSubscriptionError(req.user, "Year sub sale HipChat tower msg error: #{JSON.stringify(error)}")
-                @sendSuccess(res, user)
+  
+                # Add terminal subscription to User with extensions for existing subscriptions
+                stripeInfo = _.cloneDeep(req.user.get('stripe') ? {})
+                endDate = new Date()
+                if stripeSubscriptionPeriodEndDate
+                  endDate = stripeSubscriptionPeriodEndDate
+                else if _.isString(stripeInfo.free) and new Date() < new Date(stripeInfo.free)
+                  endDate = new Date(stripeInfo.free)
+                endDate.setUTCFullYear(endDate.getUTCFullYear() + 1)
+                stripeInfo.free = endDate.toISOString().substring(0, 10)
+                req.user.set('stripe', stripeInfo)
+  
+                # Add year's worth of gems to User
+                purchased = _.clone(req.user.get('purchased'))
+                purchased ?= {}
+                purchased.gems ?= 0
+                purchased.gems += parseInt(charge.metadata.gems)
+                req.user.set('purchased', purchased)
+  
+                req.user.save (err, user) =>
+                  if err
+                    @logSubscriptionError(req.user, "User save error: #{JSON.stringify(err)}")
+                    return @sendDatabaseError(res, err)
+                  try
+                    msg = "Year subscription purchased by #{req.user.get('email')} #{req.user.id}"
+                    hipchat.sendHipChatMessage msg, ['tower']
+                  catch error
+                    @logSubscriptionError(req.user, "Year sub sale HipChat tower msg error: #{JSON.stringify(error)}")
+                  @sendSuccess(res, user)
 
   subscribeWithPrepaidCode: (req, res) ->
     return @sendUnauthorizedError(res) unless req.user?
@@ -241,31 +236,35 @@ class SubscriptionHandler extends Handler
             @logSubscriptionError(user, "Redeem Prepaid Code Stripe cancel subscription error: #{JSON.stringify(err)}")
             return @sendDatabaseError(res, err)
 
-          # Add terminal subscription to User, extending existing subscriptions
-          # TODO: refactor this into some form useable by both this and purchaseYearSale
-          stripeInfo = _.cloneDeep(req.user.get('stripe') ? {})
-          endDate = new moment()
-          if stripeSubscriptionPeriodEndDate
-            endDate = new moment(stripeSubscriptionPeriodEndDate)
-          else if _.isString(stripeInfo.free) and new moment().isBefore(new moment(stripeInfo.free))
-            endDate = new moment(stripeInfo.free)
+          Product.findOne({name: 'basic_subscription'}).exec (err, product) =>
+            return @sendDatabaseError(res, err) if err
+            return @sendNotFoundError(res, 'basic_subscription product not found') if not product
 
-          endDate = endDate.add(months, 'months')
-          stripeInfo.free = endDate.toISOString().substring(0, 10)
-          req.user.set('stripe', stripeInfo)
-
-          # Add gems to User
-          purchased = _.clone(req.user.get('purchased'))
-          purchased ?= {}
-          purchased.gems ?= 0
-          purchased.gems += subscriptions.basic.gems * months
-          req.user.set('purchased', purchased)
-
-          req.user.save (err, user) =>
-            if err
-              @logSubscriptionError(req.user, "User save error: #{JSON.stringify(err)}")
-              return @sendDatabaseError(res, err)
-            @sendSuccess(res, user)
+            # Add terminal subscription to User, extending existing subscriptions
+            # TODO: refactor this into some form useable by both this and purchaseYearSale
+            stripeInfo = _.cloneDeep(req.user.get('stripe') ? {})
+            endDate = new moment()
+            if stripeSubscriptionPeriodEndDate
+              endDate = new moment(stripeSubscriptionPeriodEndDate)
+            else if _.isString(stripeInfo.free) and new moment().isBefore(new moment(stripeInfo.free))
+              endDate = new moment(stripeInfo.free)
+  
+            endDate = endDate.add(months, 'months')
+            stripeInfo.free = endDate.toISOString().substring(0, 10)
+            req.user.set('stripe', stripeInfo)
+  
+            # Add gems to User
+            purchased = _.clone(req.user.get('purchased'))
+            purchased ?= {}
+            purchased.gems ?= 0
+            purchased.gems += product.get('gems') * months
+            req.user.set('purchased', purchased)
+  
+            req.user.save (err, user) =>
+              if err
+                @logSubscriptionError(req.user, "User save error: #{JSON.stringify(err)}")
+                return @sendDatabaseError(res, err)
+              @sendSuccess(res, user)
 
   subscribeUser: (req, user, done) ->
     if (not req.user) or req.user.isAnonymous() or user.isAnonymous()
@@ -427,18 +426,22 @@ class SubscriptionHandler extends Handler
     req.body.stripe = stripeInfo
     user.set('stripe', stripeInfo)
 
-    if increment
-      purchased = _.clone(user.get('purchased'))
-      purchased ?= {}
-      purchased.gems ?= 0
-      purchased.gems += subscriptions.basic.gems # TODO: Put actual subscription amount here
-      user.set('purchased', purchased)
+    Product.findOne({name: 'basic_subscription'}).exec (err, product) =>
+      return @sendDatabaseError(res, err) if err
+      return @sendNotFoundError(res, 'basic_subscription product not found') if not product
 
-    user.save (err) =>
-      if err
-        @logSubscriptionError(user, 'Stripe user plan saving error. ' + err)
-        return done({res: 'Database error.', code: 500})
-      done()
+      if increment
+        purchased = _.clone(user.get('purchased'))
+        purchased ?= {}
+        purchased.gems ?= 0
+        purchased.gems += product.get('gems') # TODO: Put actual subscription amount here
+        user.set('purchased', purchased)
+  
+      user.save (err) =>
+        if err
+          @logSubscriptionError(user, 'Stripe user plan saving error. ' + err)
+          return done({res: 'Database error.', code: 500})
+        done()
 
   updateStripeRecipientSubscriptions: (req, user, customer, done) ->
     return done({res: 'Database error.', code: 500}) unless req.body.stripe?.subscribeEmails?
@@ -527,36 +530,40 @@ class SubscriptionHandler extends Handler
         @logSubscriptionError(user, 'User saving stripe error. ' + err)
         return done({res: 'Database error.', code: 500})
 
-      createUpdateFn = (recipient, increment) =>
-        (done) =>
-          # Update recipient
-          stripeInfo = _.cloneDeep(recipient.get('stripe') ? {})
-          stripeInfo.sponsorID = user.id
-          recipient.set 'stripe', stripeInfo
-          if increment
-            purchased = _.clone(recipient.get('purchased'))
-            purchased ?= {}
-            purchased.gems ?= 0
-            purchased.gems += subscriptions.basic.gems
-            recipient.set('purchased', purchased)
-          recipient.save (err) =>
-            if err
-              @logSubscriptionError(user, 'Stripe user saving stripe error. ' + err)
-              return done({res: 'Database error.', code: 500})
-            done()
+      Product.findOne({name: 'basic_subscription'}).exec (err, product) =>
+        return @sendDatabaseError(res, err) if err
+        return @sendNotFoundError(res, 'basic_subscription product not found') if not product
 
-      tasks = []
-      for sub in stripeRecipients
-        tasks.push createUpdateFn(sub.recipient, sub.increment)
+        createUpdateFn = (recipient, increment) =>
+          (done) =>
+            # Update recipient
+            stripeInfo = _.cloneDeep(recipient.get('stripe') ? {})
+            stripeInfo.sponsorID = user.id
+            recipient.set 'stripe', stripeInfo
+            if increment
+              purchased = _.clone(recipient.get('purchased'))
+              purchased ?= {}
+              purchased.gems ?= 0
+              purchased.gems += product.get('gems')
+              recipient.set('purchased', purchased)
+            recipient.save (err) =>
+              if err
+                @logSubscriptionError(user, 'Stripe user saving stripe error. ' + err)
+                return done({res: 'Database error.', code: 500})
+              done()
+  
+        tasks = []
+        for sub in stripeRecipients
+          tasks.push createUpdateFn(sub.recipient, sub.increment)
+  
+        async.parallel tasks, (err, results) =>
+          return done(err) if err
+          @updateStripeSponsorSubscription(req, user, customer, product, done)
 
-      async.parallel tasks, (err, results) =>
-        return done(err) if err
-        @updateStripeSponsorSubscription(req, user, customer, done)
-
-  updateStripeSponsorSubscription: (req, user, customer, done) ->
+  updateStripeSponsorSubscription: (req, user, customer, product, done) ->
     stripeInfo = user.get('stripe') ? {}
     numSponsored = stripeInfo.recipients.length
-    quantity = getSponsoredSubsAmount(subscriptions.basic.amount, numSponsored, stripeInfo.subscriptionID?)
+    quantity = getSponsoredSubsAmount(product.get('amount'), numSponsored, stripeInfo.subscriptionID?)
 
     findStripeSubscription customer.id, subscriptionID: stripeInfo.sponsorSubscriptionID, (subscription) =>
       if stripeInfo.sponsorSubscriptionID? and not subscription?
@@ -656,38 +663,42 @@ class SubscriptionHandler extends Handler
         @logSubscriptionError(user, 'Unable to find recipient subscription. ')
         return done({res: 'Database error.', code: 500})
 
-      # Update recipient user
-      deleteUserStripeProp(recipient, 'sponsorID')
-      recipient.save (err) =>
-        if err
-          @logSubscriptionError(user, 'Recipient user save unsubscribe error. ' + err)
-          return done({res: 'Database error.', code: 500})
+      Product.findOne({name: 'basic_subscription'}).exec (err, product) =>
+        return @sendDatabaseError(res, err) if err
+        return @sendNotFoundError(res, 'basic_subscription product not found') if not product
 
-        # Cancel Stripe subscription
-        stripe.customers.cancelSubscription stripeInfo.customerID, sponsoredEntry.subscriptionID, (err) =>
+        # Update recipient user
+        deleteUserStripeProp(recipient, 'sponsorID')
+        recipient.save (err) =>
           if err
-            @logSubscriptionError(user, "Stripe cancel sponsored subscription failed. " + err)
+            @logSubscriptionError(user, 'Recipient user save unsubscribe error. ' + err)
             return done({res: 'Database error.', code: 500})
-
-          # Update sponsor user
-          _.remove(stripeInfo.recipients, (s) -> s.userID is recipient.id)
-          delete stripeInfo.unsubscribeEmail
-          user.set('stripe', stripeInfo)
-          req.body.stripe = stripeInfo
-          user.save (err) =>
+  
+          # Cancel Stripe subscription
+          stripe.customers.cancelSubscription stripeInfo.customerID, sponsoredEntry.subscriptionID, (err) =>
             if err
-              @logSubscriptionError(user, 'Sponsor user save unsubscribe error. ' + err)
+              @logSubscriptionError(user, "Stripe cancel sponsored subscription failed. " + err)
               return done({res: 'Database error.', code: 500})
-
-            return done() unless stripeInfo.sponsorSubscriptionID?
-
-            # Update sponsored subscription quantity
-            options =
-              quantity: getSponsoredSubsAmount(subscriptions.basic.amount, stripeInfo.recipients.length, stripeInfo.subscriptionID?)
-            stripe.customers.updateSubscription stripeInfo.customerID, stripeInfo.sponsorSubscriptionID, options, (err, subscription) =>
+  
+            # Update sponsor user
+            _.remove(stripeInfo.recipients, (s) -> s.userID is recipient.id)
+            delete stripeInfo.unsubscribeEmail
+            user.set('stripe', stripeInfo)
+            req.body.stripe = stripeInfo
+            user.save (err) =>
               if err
-                @logSubscriptionError(user, 'Sponsored subscription quantity update error. ' + JSON.stringify(err))
+                @logSubscriptionError(user, 'Sponsor user save unsubscribe error. ' + err)
                 return done({res: 'Database error.', code: 500})
-              done()
+  
+              return done() unless stripeInfo.sponsorSubscriptionID?
+  
+              # Update sponsored subscription quantity
+              options =
+                quantity: getSponsoredSubsAmount(product.get('amount'), stripeInfo.recipients.length, stripeInfo.subscriptionID?)
+              stripe.customers.updateSubscription stripeInfo.customerID, stripeInfo.sponsorSubscriptionID, options, (err, subscription) =>
+                if err
+                  @logSubscriptionError(user, 'Sponsored subscription quantity update error. ' + JSON.stringify(err))
+                  return done({res: 'Database error.', code: 500})
+                done()
 
 module.exports = new SubscriptionHandler()
diff --git a/server/prepaids/prepaid_handler.coffee b/server/prepaids/prepaid_handler.coffee
index 0b5e8e984..60dceca68 100644
--- a/server/prepaids/prepaid_handler.coffee
+++ b/server/prepaids/prepaid_handler.coffee
@@ -6,6 +6,7 @@ User = require '../users/User'
 StripeUtils = require '../lib/stripe_utils'
 utils = require '../../app/core/utils'
 mongoose = require 'mongoose'
+Product = require '../models/Product'
 
 # TODO: Should this happen on a save() call instead of a prepaid/-/create post?
 # TODO: Probably a better way to create a unique 8 charactor string property using db voodoo
@@ -17,8 +18,6 @@ PrepaidHandler = class PrepaidHandler extends Handler
   jsonSchema: require '../../app/schemas/models/prepaid.schema'
   allowedMethods: ['GET','POST']
 
-  baseAmount: 999
-
   logError: (user, msg) ->
     console.warn "Prepaid Error: [#{user.get('slug')} (#{user._id})] '#{msg}'"
 
@@ -134,9 +133,13 @@ PrepaidHandler = class PrepaidHandler extends Handler
       return @sendBadInputError(res) unless isNaN(months) is false and months > 0
       return @sendError(res, 403, "Users or Months must be greater than 3") if maxRedeemers < 3 and months < 3
 
-      @purchasePrepaidTerminalSubscription req.user, description, maxRedeemers, months, timestamp, token, (err, prepaid) =>
+      Product.findOne({name: 'prepaid_subscription'}).exec (err, product) =>
         return @sendDatabaseError(res, err) if err
-        @sendSuccess(res, prepaid.toObject())
+        return @sendNotFoundError(res, 'prepaid_subscription product not found') if not product
+          
+        @purchasePrepaidTerminalSubscription req.user, description, maxRedeemers, months, timestamp, token, product, (err, prepaid) =>
+          return @sendDatabaseError(res, err) if err
+          @sendSuccess(res, prepaid.toObject())
 
     else if req.body.type is 'course'
       maxRedeemers = parseInt(req.body.maxRedeemers)
@@ -145,18 +148,22 @@ PrepaidHandler = class PrepaidHandler extends Handler
 
       return @sendBadInputError(res) unless isNaN(maxRedeemers) is false and maxRedeemers > 0
 
-      @purchasePrepaidCourse req.user, maxRedeemers, timestamp, token, (err, prepaid) =>
-        # TODO: this badinput detection is fragile, in course instance handler as well
-        return @sendBadInputError(res, err) if err is 'Missing required Stripe token'
+      Product.findOne({name: 'course'}).exec (err, product) =>
         return @sendDatabaseError(res, err) if err
-        @sendSuccess(res, prepaid.toObject())
+        return @sendNotFoundError(res, 'course product not found') if not product
+
+        @purchasePrepaidCourse req.user, maxRedeemers, timestamp, token, product, (err, prepaid) =>
+          # TODO: this badinput detection is fragile, in course instance handler as well
+          return @sendBadInputError(res, err) if err is 'Missing required Stripe token'
+          return @sendDatabaseError(res, err) if err
+          @sendSuccess(res, prepaid.toObject())
     else
       @sendForbiddenError(res)
 
-  purchasePrepaidCourse: (user, maxRedeemers, timestamp, token, done) ->
+  purchasePrepaidCourse: (user, maxRedeemers, timestamp, token, product, done) ->
     type = 'course'
 
-    amount = maxRedeemers * 400
+    amount = maxRedeemers * product.get('amount')
     if amount > 0 and not (token or user.isAdmin())
       @logError(user, "Purchase prepaid courses missing required Stripe token #{amount}")
       return done('Missing required Stripe token')
@@ -190,7 +197,7 @@ PrepaidHandler = class PrepaidHandler extends Handler
             hipchat.sendHipChatMessage msg, ['tower']
             @createPrepaid(user, type, maxRedeemers, {}, done)
 
-  purchasePrepaidTerminalSubscription: (user, description, maxRedeemers, months, timestamp, token, done) ->
+  purchasePrepaidTerminalSubscription: (user, description, maxRedeemers, months, timestamp, token, product, done) ->
     type = 'terminal_subscription'
 
     StripeUtils.getCustomer user, token, (err, customer) =>
@@ -207,7 +214,7 @@ PrepaidHandler = class PrepaidHandler extends Handler
         months: months
         productID: "prepaid #{type}"
 
-      amount = utils.getPrepaidCodeAmount(@baseAmount, maxRedeemers, months)
+      amount = utils.getPrepaidCodeAmount(product.get('amount'), maxRedeemers, months)
 
       StripeUtils.createCharge user, amount, metadata, (err, charge) =>
         if err
diff --git a/server/queues/scoring/getTwoGames.coffee b/server/queues/scoring/getTwoGames.coffee
index cba5445ac..35cce9486 100644
--- a/server/queues/scoring/getTwoGames.coffee
+++ b/server/queues/scoring/getTwoGames.coffee
@@ -3,6 +3,7 @@ async = require 'async'
 errors = require '../../commons/errors'
 scoringUtils = require './scoringUtils'
 LevelSession = require '../../levels/sessions/LevelSession'
+Mandate = require '../../models/Mandate'
 
 module.exports = getTwoGames = (req, res) ->
   #return errors.unauthorized(res, 'You need to be logged in to get games.') unless req.user?.get('email')
@@ -10,11 +11,15 @@ module.exports = getTwoGames = (req, res) ->
   humansSessionID = req.body.humansGameID
   ogresSessionID = req.body.ogresGameID
   return getSpecificSessions res, humansSessionID, ogresSessionID if humansSessionID and ogresSessionID
-  options =
-    background: req.body.background
-    levelID: req.body.levelID
-    leagueID: req.body.leagueID
-  getRandomSessions req.user, options, sendSessionsResponse(res)
+  Mandate.findOne({}).cache(5 * 60 * 1000).exec (err, mandate) ->
+    if err then return errors.serverError res, "Error fetching our Mandate: #{err}"
+    if (throughputRatio = mandate?.get 'simulationThroughputRatio')? and Math.random() > throughputRatio
+      return sendSessionsResponse(res)(null, [])
+    options =
+      background: req.body.background
+      levelID: req.body.levelID
+      leagueID: req.body.leagueID
+    getRandomSessions req.user, options, sendSessionsResponse(res)
 
 sessionSelectionString = 'team totalScore transpiledCode submittedCodeLanguage teamSpells levelID creatorName creator submitDate leagues'
 
@@ -22,7 +27,6 @@ sendSessionsResponse = (res) ->
   (err, sessions) ->
     if err then return errors.serverError res, "Couldn't get two games to simulate: #{err}"
     unless _.filter(sessions).length is 2
-      console.log 'No games to score.', sessions.length
       res.send 204, 'No games to score.'
       return res.end()
     taskObject = messageGenerated: Date.now(), sessions: (scoringUtils.formatSessionInformation session for session in sessions)
diff --git a/server/routes/contact.coffee b/server/routes/contact.coffee
index 2afa29980..7518d5115 100644
--- a/server/routes/contact.coffee
+++ b/server/routes/contact.coffee
@@ -24,6 +24,7 @@ createMailContext = (req, done) ->
   recipientID = req.body.recipientID
   subject = req.body.subject
   country = req.body.country
+  sentFromLevel = levelID: req.body.levelID, courseID: req.body.courseID, courseInstanceID: req.body.courseInstanceID
 
   level = if user?.get('points') > 0 then Math.floor(5 * Math.log((1 / 100) * (user.get('points') + 100))) + 1 else 0
   premium = user?.isPremium()
@@ -58,7 +59,7 @@ createMailContext = (req, done) ->
       done context
   else
     async.waterfall [
-      fetchRecentSessions.bind undefined, user, context
+      fetchRecentSessions.bind undefined, user, context, sentFromLevel
       # Can add other data-grabbing stuff here if we want.
     ], (err, results) ->
       console.error "Error getting contact message context for #{sender}: #{err}" if err
@@ -66,13 +67,7 @@ createMailContext = (req, done) ->
         context.email_data.content += "\n<img src='#{req.body.screenshotURL}' />"
       done context
 
-  # I'll try having it just send the emails instead of spamming the chat.
-  #if /Level Load Error/.test context.email_data.subject
-  #  message = "#{user.get('name') or user.get('email')} saw #{context.email_data.subject} <a href=\"http://direct.codecombat.com/editor/level/#{req.body.levelSlug}\">(level editor)</a>"
-  #  hipchat.sendHipChatMessage message, ['tower'], color: 'red'
-
-
-fetchRecentSessions = (user, context, callback) ->
+fetchRecentSessions = (user, context, sentFromLevel, callback) ->
   query = creator: user.get('_id') + ''
   projection = levelID: 1, levelName: 1, changed: 1, team: 1, codeLanguage: 1, 'state.complete': 1, playtime: 1
   sort = changed: -1
@@ -83,5 +78,11 @@ fetchRecentSessions = (user, context, callback) ->
       else if s.playtime < 7200 then playtime = "#{Math.round(s.playtime / 60)}m played"
       else playtime = "#{Math.round(s.playtime / 3600)}h played"
       ago = moment(s.changed).fromNow()
-      context.email_data.content += "\n<a href='http://codecombat.com/play/level/#{s.levelID}?session=#{s._id}&team=#{s.team or 'humans'}&dev=true'>#{s.levelName}#{if s.team is 'ogres' then ' ' + s.team else ''}</a>#{if s.state?.complete then ' complete ' else ''}- #{s.codeLanguage}, #{playtime}, #{ago}"
+      url = "http://codecombat.com/play/level/#{s.levelID}?session=#{s._id}&team=#{s.team or 'humans'}&dev=true"
+      urlName = "#{s.levelName}#{if s.team is 'ogres' then ' ' + s.team else ''}"
+      sessionStatus = "#{if s.state?.complete then ' complete ' else ''}- #{s.codeLanguage}, #{playtime}, #{ago}"
+      if sentFromLevel?.levelID is s.levelID and sentFromLevel?.courseID
+        url += "&course=#{sentFromLevel.courseID}&course-instance=#{sentFromLevel.courseInstanceID}"
+        urlName += ' (course)'
+      context.email_data.content += "\n<a href='#{url}'>#{urlName}</a>#{sessionStatus}"
     callback null
diff --git a/server/routes/db/product.coffee b/server/routes/db/product.coffee
new file mode 100644
index 000000000..eefd89e11
--- /dev/null
+++ b/server/routes/db/product.coffee
@@ -0,0 +1,79 @@
+Product = require '../../models/Product'
+errors = require '../../commons/errors'
+config = require '../../../server_config'
+
+module.exports.get = (req, res) ->
+
+  Product.find().lean().exec (err, products) ->
+    return errors.serverError(res) if err
+    names = (product.name for product in products)
+    unless config.isProduction
+      for product in initProducts
+        if not _.contains(names, product.name)
+          # upsert products in initProducts if they DNE
+          products.push(product)
+          new Product(product).save _.noop
+    res.send(products)
+
+###
+Stub data, used in tests and dev environment.
+  
+These values are only upserted when the test/dev db does not already contain them.
+If you are testing products and need to change them, you'll need to edit the db values directly.
+###
+
+
+initProducts = [
+  {
+    name: 'gems_5'
+    amount: 100
+    gems: 5000
+    priceString: '$1.00'
+    i18n: 'buy_gems.few_gems'
+  }
+
+  {
+    name: 'gems_10'
+    amount: 101
+    gems: 11000
+    priceString: '$1.01'
+    i18n: 'buy_gems.pile_gems'
+  }
+
+  {
+    name: 'gems_20'
+    amount: 102
+    gems: 25000
+    priceString: '$1.02'
+    i18n: 'buy_gems.chest_gems'
+  }
+
+  {
+    name: 'custom'
+    type: 'purchase'
+  }
+
+  {
+    name: 'basic_subscription'
+    amount: 100
+    gems: 3500
+    planID: 'basic'
+  }
+
+  {
+    name: 'year_subscription'
+    amount: 1000
+    gems: 42000
+  }
+
+  {
+    name: 'prepaid_subscription'
+    amount: 100
+    gems: 3500
+  }
+
+  {
+    name: 'course'
+    amount: 100
+  }
+]
\ No newline at end of file
diff --git a/server/routes/index.coffee b/server/routes/index.coffee
new file mode 100644
index 000000000..bf7bf2d08
--- /dev/null
+++ b/server/routes/index.coffee
@@ -0,0 +1,36 @@
+module.exports.setup = (app) ->
+  app.get '/db/products', require('./db/product').get
+
+  app.get '/healthcheck', (req, res) ->
+    try
+      async = require 'async'
+      User = require '../users/User'
+      async.waterfall [
+        (callback) ->
+          User.find({}).limit(1).exec(callback)
+        , (last, callback) ->
+          return("No users found") unless callback.length > 0
+          User.findOne(slug: 'healthcheck').exec(callback)
+        , (hcuser, callback) ->
+          # Create health check user if it doesnt exist
+          return callback(null, hcuser) if hcuser
+          user = new User
+            anonymous: false
+            name: 'healthcheck'
+            nameLower: 'healthcheck'
+            slug: 'healthcheck'
+            email: 'rob+healthcheck@codecombat.com'
+            emailLower: 'rob+healthcheck@codecombat.com'
+          user.set 'testGroupNumber', Math.floor(Math.random() * 256)  # also in app/core/auth
+          user.save (err) ->
+            return callback(err) if err
+            callback(null, user)
+
+        , (hcuser, callback) ->
+          activity = hcuser.trackActivity 'healthcheck', 1
+          hcuser.update {activity: activity}, callback
+      ], (err) ->
+        return res.status(500).send(err.toString()) if err
+        res.send("OK")
+    catch error
+      res.status(500).send(error.toString())
diff --git a/server_setup.coffee b/server_setup.coffee
index 230f7c56b..44b412576 100644
--- a/server_setup.coffee
+++ b/server_setup.coffee
@@ -14,6 +14,7 @@ user = require './server/users/user_handler'
 logging = require './server/commons/logging'
 config = require './server_config'
 auth = require './server/routes/auth'
+routes = require './server/routes'
 UserHandler = require './server/users/user_handler'
 hipchat = require './server/hipchat'
 global.tv4 = require 'tv4' # required for TreemaUtils to work
@@ -29,6 +30,7 @@ productionLogging = (tokens, req, res) ->
   else if status >= 300 then color = 36
   elapsed = (new Date()) - req._startTime
   elapsedColor = if elapsed < 500 then 90 else 31
+  return null if status is 404 and /\/feedback/.test req.originalUrl  # We know that these usually 404 by design (bad design?)
   if (status isnt 200 and status isnt 201 and status isnt 204 and status isnt 304 and status isnt 302) or elapsed > 500
     return "\x1b[90m#{req.method} #{req.originalUrl} \x1b[#{color}m#{res.statusCode} \x1b[#{elapsedColor}m#{elapsed}ms\x1b[0m"
   null
@@ -166,6 +168,7 @@ setupFacebookCrossDomainCommunicationRoute = (app) ->
     res.sendfile path.join(__dirname, 'public', 'channel.html')
 
 exports.setupRoutes = (app) ->
+  routes.setup(app)
   app.use app.router
 
   baseRoute.setup app
diff --git a/spec/fixtures/db-discount-handler-test-6.json b/spec/fixtures/db-discount-handler-test-6.json
index 3249a2bc5..fdc283fdf 100644
--- a/spec/fixtures/db-discount-handler-test-6.json
+++ b/spec/fixtures/db-discount-handler-test-6.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCUnKaReE7xLUdVx6ixF1h",
+            "id": "tok_17IOOlKaReE7xLUdF9cOZScg",
             "card": {
-                "id": "card_17GCUnKaReE7xLUdZ8FpRcR5"
+                "id": "card_17IOOlKaReE7xLUdwvPnfV15"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -43,55 +43,159 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG/subscriptions",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VCuZWrSt0bF8c",
+            "id": "sub_7XTLVSO3Guyty9",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363418,
-            "current_period_start": 1449685018,
-            "customer": "cus_7VCuNWxO5eWsQG",
+            "current_period_end": 1452885828,
+            "current_period_start": 1450207428,
+            "customer": "cus_7XTLw21mDCPduP",
             "discount": {
                 "coupon": {
                     "id": "500off"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG",
-                "subscription": "sub_7VCuZWrSt0bF8c"
+                "customer": "cus_7XTLw21mDCPduP",
+                "subscription": "sub_7XTLVSO3Guyty9"
             },
             "metadata": {
                 "id": "00000000000000000000005d"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG/subscriptions/sub_7VCuZWrSt0bF8c",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "sub_7VCuZWrSt0bF8c",
+            "id": "cus_7XTLw21mDCPduP",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "normal@jo.com",
+            "metadata": {
+                "id": "00000000000000000000005d"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTLVSO3Guyty9",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
+                        "discount": {
+                            "coupon": {
+                                "id": "500off"
+                            },
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
+                        },
+                        "metadata": {
+                            "id": "00000000000000000000005d"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTLw21mDCPduP",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "normal@jo.com",
+            "metadata": {
+                "id": "00000000000000000000005d"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTLVSO3Guyty9",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
+                        "discount": {
+                            "coupon": {
+                                "id": "500off"
+                            },
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
+                        },
+                        "metadata": {
+                            "id": "00000000000000000000005d"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP/subscriptions/sub_7XTLVSO3Guyty9",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTLVSO3Guyty9",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363418,
-            "current_period_start": 1449685018,
-            "customer": "cus_7VCuNWxO5eWsQG",
+            "current_period_end": 1452885828,
+            "current_period_start": 1450207428,
+            "customer": "cus_7XTLw21mDCPduP",
             "discount": {
                 "coupon": {
                     "id": "500off"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG",
-                "subscription": "sub_7VCuZWrSt0bF8c"
+                "customer": "cus_7XTLw21mDCPduP",
+                "subscription": "sub_7XTLVSO3Guyty9"
             },
             "metadata": {
                 "id": "00000000000000000000005d"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/db-discount-handler-test-7.json b/spec/fixtures/db-discount-handler-test-7.json
index bcc286b7d..812a89114 100644
--- a/spec/fixtures/db-discount-handler-test-7.json
+++ b/spec/fixtures/db-discount-handler-test-7.json
@@ -11,10 +11,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -22,7 +22,7 @@
                 "coupon": {
                     "id": "20pct"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG"
+                "customer": "cus_7XTLw21mDCPduP"
             },
             "email": "normal@jo.com",
             "metadata": {
@@ -31,8 +31,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -40,24 +40,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCuZWrSt0bF8c",
+                        "id": "sub_7XTLVSO3Guyty9",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363418,
-                        "current_period_start": 1449685018,
-                        "customer": "cus_7VCuNWxO5eWsQG",
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
                         "discount": {
                             "coupon": {
                                 "id": "500off"
                             },
-                            "customer": "cus_7VCuNWxO5eWsQG",
-                            "subscription": "sub_7VCuZWrSt0bF8c"
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
                         },
                         "metadata": {
                             "id": "00000000000000000000005d"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -69,10 +69,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -80,7 +80,7 @@
                 "coupon": {
                     "id": "20pct"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG"
+                "customer": "cus_7XTLw21mDCPduP"
             },
             "email": "normal@jo.com",
             "metadata": {
@@ -89,8 +89,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -98,24 +98,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCuZWrSt0bF8c",
+                        "id": "sub_7XTLVSO3Guyty9",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363418,
-                        "current_period_start": 1449685018,
-                        "customer": "cus_7VCuNWxO5eWsQG",
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
                         "discount": {
                             "coupon": {
                                 "id": "500off"
                             },
-                            "customer": "cus_7VCuNWxO5eWsQG",
-                            "subscription": "sub_7VCuZWrSt0bF8c"
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
                         },
                         "metadata": {
                             "id": "00000000000000000000005d"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-discount-handler-test-8.json b/spec/fixtures/db-discount-handler-test-8.json
index 8a20e77c2..23330f6fe 100644
--- a/spec/fixtures/db-discount-handler-test-8.json
+++ b/spec/fixtures/db-discount-handler-test-8.json
@@ -2,17 +2,17 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG/discount",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP/discount",
         "status": 200,
         "response": {}
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -23,8 +23,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -32,24 +32,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCuZWrSt0bF8c",
+                        "id": "sub_7XTLVSO3Guyty9",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363418,
-                        "current_period_start": 1449685018,
-                        "customer": "cus_7VCuNWxO5eWsQG",
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
                         "discount": {
                             "coupon": {
                                 "id": "500off"
                             },
-                            "customer": "cus_7VCuNWxO5eWsQG",
-                            "subscription": "sub_7VCuZWrSt0bF8c"
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
                         },
                         "metadata": {
                             "id": "00000000000000000000005d"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-discount-handler-test-9.json b/spec/fixtures/db-discount-handler-test-9.json
index bcc286b7d..812a89114 100644
--- a/spec/fixtures/db-discount-handler-test-9.json
+++ b/spec/fixtures/db-discount-handler-test-9.json
@@ -11,10 +11,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -22,7 +22,7 @@
                 "coupon": {
                     "id": "20pct"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG"
+                "customer": "cus_7XTLw21mDCPduP"
             },
             "email": "normal@jo.com",
             "metadata": {
@@ -31,8 +31,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -40,24 +40,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCuZWrSt0bF8c",
+                        "id": "sub_7XTLVSO3Guyty9",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363418,
-                        "current_period_start": 1449685018,
-                        "customer": "cus_7VCuNWxO5eWsQG",
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
                         "discount": {
                             "coupon": {
                                 "id": "500off"
                             },
-                            "customer": "cus_7VCuNWxO5eWsQG",
-                            "subscription": "sub_7VCuZWrSt0bF8c"
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
                         },
                         "metadata": {
                             "id": "00000000000000000000005d"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -69,10 +69,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCuNWxO5eWsQG",
+        "path": "/v1/customers/cus_7XTLw21mDCPduP",
         "status": 200,
         "response": {
-            "id": "cus_7VCuNWxO5eWsQG",
+            "id": "cus_7XTLw21mDCPduP",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -80,7 +80,7 @@
                 "coupon": {
                     "id": "20pct"
                 },
-                "customer": "cus_7VCuNWxO5eWsQG"
+                "customer": "cus_7XTLw21mDCPduP"
             },
             "email": "normal@jo.com",
             "metadata": {
@@ -89,8 +89,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUnKaReE7xLUdZ8FpRcR5",
-                        "customer": "cus_7VCuNWxO5eWsQG"
+                        "id": "card_17IOOlKaReE7xLUdwvPnfV15",
+                        "customer": "cus_7XTLw21mDCPduP"
                     }
                 ],
                 "has_more": false
@@ -98,24 +98,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCuZWrSt0bF8c",
+                        "id": "sub_7XTLVSO3Guyty9",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363418,
-                        "current_period_start": 1449685018,
-                        "customer": "cus_7VCuNWxO5eWsQG",
+                        "current_period_end": 1452885828,
+                        "current_period_start": 1450207428,
+                        "customer": "cus_7XTLw21mDCPduP",
                         "discount": {
                             "coupon": {
                                 "id": "500off"
                             },
-                            "customer": "cus_7VCuNWxO5eWsQG",
-                            "subscription": "sub_7VCuZWrSt0bF8c"
+                            "customer": "cus_7XTLw21mDCPduP",
+                            "subscription": "sub_7XTLVSO3Guyty9"
                         },
                         "metadata": {
                             "id": "00000000000000000000005d"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-payment-check-stripe-charges-test-01.json b/spec/fixtures/db-payment-check-stripe-charges-test-01.json
index 468582df7..836f027d1 100644
--- a/spec/fixtures/db-payment-check-stripe-charges-test-01.json
+++ b/spec/fixtures/db-payment-check-stripe-charges-test-01.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVJKaReE7xLUdzpXOGZ9v",
+            "id": "tok_17IOPOKaReE7xLUdfaGNs2bY",
             "card": {
-                "id": "card_17GCVJKaReE7xLUdKOWpllRX"
+                "id": "card_17IOPOKaReE7xLUdynADA8zk"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvE20H99SoVJ",
+            "id": "cus_7XTMkthRYmfilo",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVJKaReE7xLUdKOWpllRX",
-                        "customer": "cus_7VCvE20H99SoVJ"
+                        "id": "card_17IOPOKaReE7xLUdynADA8zk",
+                        "customer": "cus_7XTMkthRYmfilo"
                     }
                 ],
                 "has_more": false
@@ -52,10 +52,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvE20H99SoVJ",
+        "path": "/v1/customers/cus_7XTMkthRYmfilo",
         "status": 200,
         "response": {
-            "id": "cus_7VCvE20H99SoVJ",
+            "id": "cus_7XTMkthRYmfilo",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -66,8 +66,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVJKaReE7xLUdKOWpllRX",
-                        "customer": "cus_7VCvE20H99SoVJ"
+                        "id": "card_17IOPOKaReE7xLUdynADA8zk",
+                        "customer": "cus_7XTMkthRYmfilo"
                     }
                 ],
                 "has_more": false
@@ -83,21 +83,21 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVLKaReE7xLUdb9DcZ4om",
-            "amount": 499,
-            "customer": "cus_7VCvE20H99SoVJ",
+            "id": "ch_17IOPQKaReE7xLUdsAmwl7fg",
+            "amount": 100,
+            "customer": "cus_7XTMkthRYmfilo",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
-                "timestamp": "1449685049575"
+                "timestamp": "1450207466249"
             },
             "paid": true,
             "refunds": {
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVJKaReE7xLUdKOWpllRX",
-                "customer": "cus_7VCvE20H99SoVJ"
+                "id": "card_17IOPOKaReE7xLUdynADA8zk",
+                "customer": "cus_7XTMkthRYmfilo"
             }
         }
     },
@@ -109,21 +109,21 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVLKaReE7xLUdb9DcZ4om",
-                    "amount": 499,
-                    "customer": "cus_7VCvE20H99SoVJ",
+                    "id": "ch_17IOPQKaReE7xLUdsAmwl7fg",
+                    "amount": 100,
+                    "customer": "cus_7XTMkthRYmfilo",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685049575"
+                        "timestamp": "1450207466249"
                     },
                     "paid": true,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCVJKaReE7xLUdKOWpllRX",
-                        "customer": "cus_7VCvE20H99SoVJ"
+                        "id": "card_17IOPOKaReE7xLUdynADA8zk",
+                        "customer": "cus_7XTMkthRYmfilo"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-custom-stripe-test-01.json b/spec/fixtures/db-payment-custom-stripe-test-01.json
index 38acb11c3..467f2e12d 100644
--- a/spec/fixtures/db-payment-custom-stripe-test-01.json
+++ b/spec/fixtures/db-payment-custom-stripe-test-01.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVNKaReE7xLUd2tmSQ1KH",
+            "id": "tok_17IOPSKaReE7xLUdyZv4jUA6",
             "card": {
-                "id": "card_17GCVMKaReE7xLUdZVTFHMmq"
+                "id": "card_17IOPSKaReE7xLUdOOKz1MOG"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvZ7KBrJ8csQ",
+            "id": "cus_7XTMBOnMy9jbYM",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVMKaReE7xLUdZVTFHMmq",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPSKaReE7xLUdOOKz1MOG",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 ],
                 "has_more": false
@@ -52,10 +52,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvZ7KBrJ8csQ",
+        "path": "/v1/customers/cus_7XTMBOnMy9jbYM",
         "status": 200,
         "response": {
-            "id": "cus_7VCvZ7KBrJ8csQ",
+            "id": "cus_7XTMBOnMy9jbYM",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -66,8 +66,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVMKaReE7xLUdZVTFHMmq",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPSKaReE7xLUdOOKz1MOG",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 ],
                 "has_more": false
@@ -83,9 +83,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVOKaReE7xLUd1ZQVMJKB",
+            "id": "ch_17IOPUKaReE7xLUd1gLXrdte",
             "amount": 5000,
-            "customer": "cus_7VCvZ7KBrJ8csQ",
+            "customer": "cus_7XTMBOnMy9jbYM",
             "metadata": {
                 "productID": "custom",
                 "timestamp": "1447445242091",
@@ -96,8 +96,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVMKaReE7xLUdZVTFHMmq",
-                "customer": "cus_7VCvZ7KBrJ8csQ"
+                "id": "card_17IOPSKaReE7xLUdOOKz1MOG",
+                "customer": "cus_7XTMBOnMy9jbYM"
             }
         }
     }
diff --git a/spec/fixtures/db-payment-custom-stripe-test-02.json b/spec/fixtures/db-payment-custom-stripe-test-02.json
index c3c2b6946..6925de700 100644
--- a/spec/fixtures/db-payment-custom-stripe-test-02.json
+++ b/spec/fixtures/db-payment-custom-stripe-test-02.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVPKaReE7xLUdJcZimvbF",
+            "id": "tok_17IOPVKaReE7xLUdJAvZ79Fe",
             "card": {
-                "id": "card_17GCVPKaReE7xLUdRwBCjoW4"
+                "id": "card_17IOPVKaReE7xLUdhslZrW4t"
             },
             "type": "card"
         }
@@ -15,10 +15,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvZ7KBrJ8csQ",
+        "path": "/v1/customers/cus_7XTMBOnMy9jbYM",
         "status": 200,
         "response": {
-            "id": "cus_7VCvZ7KBrJ8csQ",
+            "id": "cus_7XTMBOnMy9jbYM",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVPKaReE7xLUdRwBCjoW4",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPVKaReE7xLUdhslZrW4t",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 ],
                 "has_more": false
@@ -48,9 +48,9 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVOKaReE7xLUd1ZQVMJKB",
+                    "id": "ch_17IOPUKaReE7xLUd1gLXrdte",
                     "amount": 5000,
-                    "customer": "cus_7VCvZ7KBrJ8csQ",
+                    "customer": "cus_7XTMBOnMy9jbYM",
                     "metadata": {
                         "productID": "custom",
                         "timestamp": "1447445242091",
@@ -61,8 +61,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCVMKaReE7xLUdZVTFHMmq",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPSKaReE7xLUdOOKz1MOG",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 }
             ],
@@ -75,9 +75,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVSKaReE7xLUdd5E7dowz",
+            "id": "ch_17IOPXKaReE7xLUdEinedgz6",
             "amount": 73000,
-            "customer": "cus_7VCvZ7KBrJ8csQ",
+            "customer": "cus_7XTMBOnMy9jbYM",
             "metadata": {
                 "productID": "custom",
                 "timestamp": "1447445242092"
@@ -87,8 +87,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVPKaReE7xLUdRwBCjoW4",
-                "customer": "cus_7VCvZ7KBrJ8csQ"
+                "id": "card_17IOPVKaReE7xLUdhslZrW4t",
+                "customer": "cus_7XTMBOnMy9jbYM"
             }
         }
     }
diff --git a/spec/fixtures/db-payment-custom-stripe-test-03.json b/spec/fixtures/db-payment-custom-stripe-test-03.json
index 2e22ae9e4..092fb580a 100644
--- a/spec/fixtures/db-payment-custom-stripe-test-03.json
+++ b/spec/fixtures/db-payment-custom-stripe-test-03.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVTKaReE7xLUdOnqynJY7",
+            "id": "tok_17IOPYKaReE7xLUdSnJV6x8N",
             "card": {
-                "id": "card_17GCVSKaReE7xLUdjh0HgmFn"
+                "id": "card_17IOPYKaReE7xLUdXqbKgSlb"
             },
             "type": "card"
         }
@@ -15,10 +15,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvZ7KBrJ8csQ",
+        "path": "/v1/customers/cus_7XTMBOnMy9jbYM",
         "status": 200,
         "response": {
-            "id": "cus_7VCvZ7KBrJ8csQ",
+            "id": "cus_7XTMBOnMy9jbYM",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVSKaReE7xLUdjh0HgmFn",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPYKaReE7xLUdXqbKgSlb",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 ],
                 "has_more": false
@@ -48,9 +48,9 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVSKaReE7xLUdd5E7dowz",
+                    "id": "ch_17IOPXKaReE7xLUdEinedgz6",
                     "amount": 73000,
-                    "customer": "cus_7VCvZ7KBrJ8csQ",
+                    "customer": "cus_7XTMBOnMy9jbYM",
                     "metadata": {
                         "productID": "custom",
                         "timestamp": "1447445242092"
@@ -60,14 +60,14 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCVPKaReE7xLUdRwBCjoW4",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPVKaReE7xLUdhslZrW4t",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 },
                 {
-                    "id": "ch_17GCVOKaReE7xLUd1ZQVMJKB",
+                    "id": "ch_17IOPUKaReE7xLUd1gLXrdte",
                     "amount": 5000,
-                    "customer": "cus_7VCvZ7KBrJ8csQ",
+                    "customer": "cus_7XTMBOnMy9jbYM",
                     "metadata": {
                         "productID": "custom",
                         "timestamp": "1447445242091",
@@ -78,8 +78,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCVMKaReE7xLUdZVTFHMmq",
-                        "customer": "cus_7VCvZ7KBrJ8csQ"
+                        "id": "card_17IOPSKaReE7xLUdOOKz1MOG",
+                        "customer": "cus_7XTMBOnMy9jbYM"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-stripe-test-01.json b/spec/fixtures/db-payment-stripe-test-01.json
index af554345d..94b623cb9 100644
--- a/spec/fixtures/db-payment-stripe-test-01.json
+++ b/spec/fixtures/db-payment-stripe-test-01.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCUvKaReE7xLUdo7q79Zbp",
+            "id": "tok_17IOOxKaReE7xLUdajQLXj2u",
             "card": {
-                "id": "card_17GCUvKaReE7xLUdBp1HF9sT"
+                "id": "card_17IOOxKaReE7xLUdaA1sZ1RB"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCubHuvGFt4nH",
+            "id": "cus_7XTLZvrxxi9h67",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 ],
                 "has_more": false
@@ -52,10 +52,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCubHuvGFt4nH",
+        "path": "/v1/customers/cus_7XTLZvrxxi9h67",
         "status": 200,
         "response": {
-            "id": "cus_7VCubHuvGFt4nH",
+            "id": "cus_7XTLZvrxxi9h67",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -66,8 +66,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 ],
                 "has_more": false
@@ -83,9 +83,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCUxKaReE7xLUddy1fN9Nl",
-            "amount": 499,
-            "customer": "cus_7VCubHuvGFt4nH",
+            "id": "ch_17IOOyKaReE7xLUdzY39hxln",
+            "amount": 100,
+            "customer": "cus_7XTLZvrxxi9h67",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
@@ -96,8 +96,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                "customer": "cus_7VCubHuvGFt4nH"
+                "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                "customer": "cus_7XTLZvrxxi9h67"
             }
         }
     }
diff --git a/spec/fixtures/db-payment-stripe-test-02.json b/spec/fixtures/db-payment-stripe-test-02.json
index 459f59788..c78a86230 100644
--- a/spec/fixtures/db-payment-stripe-test-02.json
+++ b/spec/fixtures/db-payment-stripe-test-02.json
@@ -2,7 +2,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCubHuvGFt4nH",
+        "path": "/v1/customers/cus_7XTLZvrxxi9h67",
         "status": 400,
         "response": {
             "error": {
@@ -18,9 +18,9 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCUxKaReE7xLUddy1fN9Nl",
-                    "amount": 499,
-                    "customer": "cus_7VCubHuvGFt4nH",
+                    "id": "ch_17IOOyKaReE7xLUdzY39hxln",
+                    "amount": 100,
+                    "customer": "cus_7XTLZvrxxi9h67",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
@@ -31,8 +31,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-stripe-test-03.json b/spec/fixtures/db-payment-stripe-test-03.json
index 5b0e1a3e6..1292b6d3f 100644
--- a/spec/fixtures/db-payment-stripe-test-03.json
+++ b/spec/fixtures/db-payment-stripe-test-03.json
@@ -7,9 +7,9 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCUxKaReE7xLUddy1fN9Nl",
-                    "amount": 499,
-                    "customer": "cus_7VCubHuvGFt4nH",
+                    "id": "ch_17IOOyKaReE7xLUdzY39hxln",
+                    "amount": 100,
+                    "customer": "cus_7XTLZvrxxi9h67",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
@@ -20,8 +20,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 }
             ],
@@ -34,21 +34,21 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCUzKaReE7xLUdviRu5P6Z",
-            "amount": 499,
-            "customer": "cus_7VCubHuvGFt4nH",
+            "id": "ch_17IOP1KaReE7xLUdLHaawQjF",
+            "amount": 100,
+            "customer": "cus_7XTLZvrxxi9h67",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
-                "timestamp": "1449685028592"
+                "timestamp": "1450207442600"
             },
             "paid": true,
             "refunds": {
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                "customer": "cus_7VCubHuvGFt4nH"
+                "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                "customer": "cus_7XTLZvrxxi9h67"
             }
         }
     }
diff --git a/spec/fixtures/db-payment-stripe-test-04.json b/spec/fixtures/db-payment-stripe-test-04.json
index f4b4106bd..715ce1617 100644
--- a/spec/fixtures/db-payment-stripe-test-04.json
+++ b/spec/fixtures/db-payment-stripe-test-04.json
@@ -2,10 +2,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCubHuvGFt4nH",
+        "path": "/v1/customers/cus_7XTLZvrxxi9h67",
         "status": 200,
         "response": {
-            "id": "cus_7VCubHuvGFt4nH",
+            "id": "cus_7XTLZvrxxi9h67",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -16,8 +16,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 ],
                 "has_more": false
@@ -33,9 +33,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCV0KaReE7xLUd6riHo5io",
+            "id": "tok_17IOP2KaReE7xLUdxvu0xWNX",
             "card": {
-                "id": "card_17GCV0KaReE7xLUdA7hdLMnV"
+                "id": "card_17IOP2KaReE7xLUdgHcD4Uj5"
             },
             "type": "card"
         }
@@ -43,10 +43,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCubHuvGFt4nH",
+        "path": "/v1/customers/cus_7XTLZvrxxi9h67",
         "status": 200,
         "response": {
-            "id": "cus_7VCubHuvGFt4nH",
+            "id": "cus_7XTLZvrxxi9h67",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -57,8 +57,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV0KaReE7xLUdA7hdLMnV",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOP2KaReE7xLUdgHcD4Uj5",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 ],
                 "has_more": false
@@ -76,27 +76,27 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCUzKaReE7xLUdviRu5P6Z",
-                    "amount": 499,
-                    "customer": "cus_7VCubHuvGFt4nH",
+                    "id": "ch_17IOP1KaReE7xLUdLHaawQjF",
+                    "amount": 100,
+                    "customer": "cus_7XTLZvrxxi9h67",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685028592"
+                        "timestamp": "1450207442600"
                     },
                     "paid": true,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 },
                 {
-                    "id": "ch_17GCUxKaReE7xLUddy1fN9Nl",
-                    "amount": 499,
-                    "customer": "cus_7VCubHuvGFt4nH",
+                    "id": "ch_17IOOyKaReE7xLUdzY39hxln",
+                    "amount": 100,
+                    "customer": "cus_7XTLZvrxxi9h67",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
@@ -107,8 +107,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCUvKaReE7xLUdBp1HF9sT",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOOxKaReE7xLUdaA1sZ1RB",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 }
             ],
@@ -121,31 +121,31 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCV2KaReE7xLUdffVpUhFO",
-            "amount": 499,
-            "customer": "cus_7VCubHuvGFt4nH",
+            "id": "ch_17IOP4KaReE7xLUdLWQ28NtO",
+            "amount": 100,
+            "customer": "cus_7XTLZvrxxi9h67",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
-                "timestamp": "1449685031026"
+                "timestamp": "1450207444904"
             },
             "paid": true,
             "refunds": {
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCV0KaReE7xLUdA7hdLMnV",
-                "customer": "cus_7VCubHuvGFt4nH"
+                "id": "card_17IOP2KaReE7xLUdgHcD4Uj5",
+                "customer": "cus_7XTLZvrxxi9h67"
             }
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCubHuvGFt4nH",
+        "path": "/v1/customers/cus_7XTLZvrxxi9h67",
         "status": 200,
         "response": {
-            "id": "cus_7VCubHuvGFt4nH",
+            "id": "cus_7XTLZvrxxi9h67",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -156,8 +156,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV0KaReE7xLUdA7hdLMnV",
-                        "customer": "cus_7VCubHuvGFt4nH"
+                        "id": "card_17IOP2KaReE7xLUdgHcD4Uj5",
+                        "customer": "cus_7XTLZvrxxi9h67"
                     }
                 ],
                 "has_more": false
diff --git a/spec/fixtures/db-payment-stripe-test-05.json b/spec/fixtures/db-payment-stripe-test-05.json
index 9a8f1f1c5..edc2ca3de 100644
--- a/spec/fixtures/db-payment-stripe-test-05.json
+++ b/spec/fixtures/db-payment-stripe-test-05.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCV3KaReE7xLUdLcKedDEd",
+            "id": "tok_17IOP6KaReE7xLUdyel0tJtw",
             "card": {
-                "id": "card_17GCV3KaReE7xLUdFUXfU85r"
+                "id": "card_17IOP6KaReE7xLUdvj1C0uY3"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCuAQ6nYInY8z",
+            "id": "cus_7XTLwWj4NCwj2S",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV3KaReE7xLUdFUXfU85r",
-                        "customer": "cus_7VCuAQ6nYInY8z"
+                        "id": "card_17IOP6KaReE7xLUdvj1C0uY3",
+                        "customer": "cus_7XTLwWj4NCwj2S"
                     }
                 ],
                 "has_more": false
@@ -52,10 +52,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuAQ6nYInY8z",
+        "path": "/v1/customers/cus_7XTLwWj4NCwj2S",
         "status": 200,
         "response": {
-            "id": "cus_7VCuAQ6nYInY8z",
+            "id": "cus_7XTLwWj4NCwj2S",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -66,8 +66,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV3KaReE7xLUdFUXfU85r",
-                        "customer": "cus_7VCuAQ6nYInY8z"
+                        "id": "card_17IOP6KaReE7xLUdvj1C0uY3",
+                        "customer": "cus_7XTLwWj4NCwj2S"
                     }
                 ],
                 "has_more": false
@@ -83,9 +83,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCV5KaReE7xLUd0amzDJs7",
-            "amount": 499,
-            "customer": "cus_7VCuAQ6nYInY8z",
+            "id": "ch_17IOP7KaReE7xLUdDnFZwMu7",
+            "amount": 100,
+            "customer": "cus_7XTLwWj4NCwj2S",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
@@ -96,15 +96,15 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCV3KaReE7xLUdFUXfU85r",
-                "customer": "cus_7VCuAQ6nYInY8z"
+                "id": "card_17IOP6KaReE7xLUdvj1C0uY3",
+                "customer": "cus_7XTLwWj4NCwj2S"
             }
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuAQ6nYInY8z",
+        "path": "/v1/customers/cus_7XTLwWj4NCwj2S",
         "status": 400,
         "response": {
             "error": {
@@ -120,9 +120,9 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCV5KaReE7xLUd0amzDJs7",
-                    "amount": 499,
-                    "customer": "cus_7VCuAQ6nYInY8z",
+                    "id": "ch_17IOP7KaReE7xLUdDnFZwMu7",
+                    "amount": 100,
+                    "customer": "cus_7XTLwWj4NCwj2S",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
@@ -133,8 +133,8 @@
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV3KaReE7xLUdFUXfU85r",
-                        "customer": "cus_7VCuAQ6nYInY8z"
+                        "id": "card_17IOP6KaReE7xLUdvj1C0uY3",
+                        "customer": "cus_7XTLwWj4NCwj2S"
                     }
                 }
             ],
@@ -147,9 +147,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCV6KaReE7xLUdiTvUGa07",
-            "amount": 499,
-            "customer": "cus_7VCuAQ6nYInY8z",
+            "id": "ch_17IOP9KaReE7xLUdEyubPCWU",
+            "amount": 100,
+            "customer": "cus_7XTLwWj4NCwj2S",
             "metadata": {
                 "productID": "gems_5",
                 "gems": "5000",
@@ -160,8 +160,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCV3KaReE7xLUdFUXfU85r",
-                "customer": "cus_7VCuAQ6nYInY8z"
+                "id": "card_17IOP6KaReE7xLUdvj1C0uY3",
+                "customer": "cus_7XTLwWj4NCwj2S"
             }
         }
     }
diff --git a/spec/fixtures/db-payment-stripe-test-06.json b/spec/fixtures/db-payment-stripe-test-06.json
index c0a98e4f2..1ad50fb4c 100644
--- a/spec/fixtures/db-payment-stripe-test-06.json
+++ b/spec/fixtures/db-payment-stripe-test-06.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCV7KaReE7xLUd3gnnjv7x",
+            "id": "tok_17IOPAKaReE7xLUdrPE253ea",
             "card": {
-                "id": "card_17GCV7KaReE7xLUdiPjgEUMd"
+                "id": "card_17IOPAKaReE7xLUdbLiixDCY"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCuzP303kt1eU",
+            "id": "cus_7XTL5uSTRsbBAg",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 ],
                 "has_more": false
@@ -52,10 +52,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuzP303kt1eU",
+        "path": "/v1/customers/cus_7XTL5uSTRsbBAg",
         "status": 200,
         "response": {
-            "id": "cus_7VCuzP303kt1eU",
+            "id": "cus_7XTL5uSTRsbBAg",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -66,8 +66,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 ],
                 "has_more": false
diff --git a/spec/fixtures/db-payment-stripe-test-07.json b/spec/fixtures/db-payment-stripe-test-07.json
index 9a7cab4b2..d84a9f127 100644
--- a/spec/fixtures/db-payment-stripe-test-07.json
+++ b/spec/fixtures/db-payment-stripe-test-07.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCV9KaReE7xLUdelU9sCaA",
+            "id": "tok_17IOPDKaReE7xLUdOTkDGNQH",
             "card": {
-                "id": "card_17GCV9KaReE7xLUd5uODONlo"
+                "id": "card_17IOPDKaReE7xLUdOPYVzwbP"
             },
             "type": "card"
         }
@@ -15,7 +15,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuzP303kt1eU",
+        "path": "/v1/customers/cus_7XTL5uSTRsbBAg",
         "status": 402,
         "response": {
             "error": {
@@ -31,21 +31,21 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCV9KaReE7xLUduvVirhN5",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPCKaReE7xLUdjfj5TqZH",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685037831"
+                        "timestamp": "1450207452790"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-stripe-test-08.json b/spec/fixtures/db-payment-stripe-test-08.json
index 3befce952..95a468d77 100644
--- a/spec/fixtures/db-payment-stripe-test-08.json
+++ b/spec/fixtures/db-payment-stripe-test-08.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVCKaReE7xLUdWbFQacYN",
+            "id": "tok_17IOPFKaReE7xLUdEKcEw4rn",
             "card": {
-                "id": "card_17GCVCKaReE7xLUdjoXBJKqC"
+                "id": "card_17IOPFKaReE7xLUdIsElfCWI"
             },
             "type": "card"
         }
@@ -15,7 +15,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuzP303kt1eU",
+        "path": "/v1/customers/cus_7XTL5uSTRsbBAg",
         "status": 402,
         "response": {
             "error": {
@@ -31,39 +31,39 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVBKaReE7xLUduQybm6xT",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPFKaReE7xLUdToSxLUhB",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685040285"
+                        "timestamp": "1450207455401"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCV9KaReE7xLUduvVirhN5",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPCKaReE7xLUdjfj5TqZH",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685037831"
+                        "timestamp": "1450207452790"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-stripe-test-09.json b/spec/fixtures/db-payment-stripe-test-09.json
index bd02c1026..8a92ab583 100644
--- a/spec/fixtures/db-payment-stripe-test-09.json
+++ b/spec/fixtures/db-payment-stripe-test-09.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVEKaReE7xLUdByVccSzA",
+            "id": "tok_17IOPIKaReE7xLUdohRtii5V",
             "card": {
-                "id": "card_17GCVEKaReE7xLUdRUCeIUtP"
+                "id": "card_17IOPIKaReE7xLUdQ34s7FHR"
             },
             "type": "card"
         }
@@ -15,7 +15,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuzP303kt1eU",
+        "path": "/v1/customers/cus_7XTL5uSTRsbBAg",
         "status": 402,
         "response": {
             "error": {
@@ -31,57 +31,57 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVDKaReE7xLUdyZAPbXCM",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPIKaReE7xLUdReuRmdCl",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685042746"
+                        "timestamp": "1450207457940"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCVBKaReE7xLUduQybm6xT",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPFKaReE7xLUdToSxLUhB",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685040285"
+                        "timestamp": "1450207455401"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCV9KaReE7xLUduvVirhN5",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPCKaReE7xLUdjfj5TqZH",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685037831"
+                        "timestamp": "1450207452790"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-payment-stripe-test-10.json b/spec/fixtures/db-payment-stripe-test-10.json
index 1f7a23c02..c2822a21e 100644
--- a/spec/fixtures/db-payment-stripe-test-10.json
+++ b/spec/fixtures/db-payment-stripe-test-10.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVHKaReE7xLUdB9odSMB6",
+            "id": "tok_17IOPLKaReE7xLUdiOrt8XEg",
             "card": {
-                "id": "card_17GCVHKaReE7xLUdAYwa1Wkj"
+                "id": "card_17IOPLKaReE7xLUdUtDdouiy"
             },
             "type": "card"
         }
@@ -15,7 +15,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCuzP303kt1eU",
+        "path": "/v1/customers/cus_7XTL5uSTRsbBAg",
         "status": 402,
         "response": {
             "error": {
@@ -31,75 +31,75 @@
         "response": {
             "data": [
                 {
-                    "id": "ch_17GCVGKaReE7xLUdu3HU9wB5",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPKKaReE7xLUdGocBlrbj",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685044928"
+                        "timestamp": "1450207460901"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCVDKaReE7xLUdyZAPbXCM",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPIKaReE7xLUdReuRmdCl",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685042746"
+                        "timestamp": "1450207457940"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCVBKaReE7xLUduQybm6xT",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPFKaReE7xLUdToSxLUhB",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685040285"
+                        "timestamp": "1450207455401"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 },
                 {
-                    "id": "ch_17GCV9KaReE7xLUduvVirhN5",
-                    "amount": 499,
-                    "customer": "cus_7VCuzP303kt1eU",
+                    "id": "ch_17IOPCKaReE7xLUdjfj5TqZH",
+                    "amount": 100,
+                    "customer": "cus_7XTL5uSTRsbBAg",
                     "metadata": {
                         "productID": "gems_5",
                         "gems": "5000",
-                        "timestamp": "1449685037831"
+                        "timestamp": "1450207452790"
                     },
                     "paid": false,
                     "refunds": {
                         "has_more": false
                     },
                     "source": {
-                        "id": "card_17GCV7KaReE7xLUdiPjgEUMd",
-                        "customer": "cus_7VCuzP303kt1eU"
+                        "id": "card_17IOPAKaReE7xLUdbLiixDCY",
+                        "customer": "cus_7XTL5uSTRsbBAg"
                     }
                 }
             ],
diff --git a/spec/fixtures/db-prepaid-purchase-course-test-1.json b/spec/fixtures/db-prepaid-purchase-course-test-1.json
index be2af91f9..2f9e39595 100644
--- a/spec/fixtures/db-prepaid-purchase-course-test-1.json
+++ b/spec/fixtures/db-prepaid-purchase-course-test-1.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVVKaReE7xLUd9mYY9N7i",
+            "id": "tok_17IOPcKaReE7xLUd21HNj8Lx",
             "card": {
-                "id": "card_17GCVVKaReE7xLUdlhNMXbGd"
+                "id": "card_17IOPcKaReE7xLUdk4xzxjp3"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-course-test-2.json b/spec/fixtures/db-prepaid-purchase-course-test-2.json
index 0c947bcf1..dfad49d53 100644
--- a/spec/fixtures/db-prepaid-purchase-course-test-2.json
+++ b/spec/fixtures/db-prepaid-purchase-course-test-2.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVVKaReE7xLUdNnWusa8M",
+            "id": "tok_17IOPdKaReE7xLUdTLUKnG0J",
             "card": {
-                "id": "card_17GCVVKaReE7xLUdNzakl6za"
+                "id": "card_17IOPdKaReE7xLUds6oneFJM"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvt7iNlagXQA",
+            "id": "cus_7XTMzZwqOZpLXW",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVVKaReE7xLUdNzakl6za",
-                        "customer": "cus_7VCvt7iNlagXQA"
+                        "id": "card_17IOPdKaReE7xLUds6oneFJM",
+                        "customer": "cus_7XTMzZwqOZpLXW"
                     }
                 ],
                 "has_more": false
@@ -43,10 +43,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvt7iNlagXQA",
+        "path": "/v1/customers/cus_7XTMzZwqOZpLXW",
         "status": 200,
         "response": {
-            "id": "cus_7VCvt7iNlagXQA",
+            "id": "cus_7XTMzZwqOZpLXW",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -57,8 +57,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVVKaReE7xLUdNzakl6za",
-                        "customer": "cus_7VCvt7iNlagXQA"
+                        "id": "card_17IOPdKaReE7xLUds6oneFJM",
+                        "customer": "cus_7XTMzZwqOZpLXW"
                     }
                 ],
                 "has_more": false
@@ -74,12 +74,12 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVWKaReE7xLUdZLmqWCt6",
-            "amount": 400,
-            "customer": "cus_7VCvt7iNlagXQA",
+            "id": "ch_17IOPeKaReE7xLUd3o8mN5yw",
+            "amount": 100,
+            "customer": "cus_7XTMzZwqOZpLXW",
             "metadata": {
                 "type": "course",
-                "timestamp": "1449685061856",
+                "timestamp": "1450207481311",
                 "productID": "prepaid course"
             },
             "paid": true,
@@ -87,8 +87,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVVKaReE7xLUdNzakl6za",
-                "customer": "cus_7VCvt7iNlagXQA"
+                "id": "card_17IOPdKaReE7xLUds6oneFJM",
+                "customer": "cus_7XTMzZwqOZpLXW"
             }
         }
     }
diff --git a/spec/fixtures/db-prepaid-purchase-course-test-3.json b/spec/fixtures/db-prepaid-purchase-course-test-3.json
index 8fa107d42..37b690c92 100644
--- a/spec/fixtures/db-prepaid-purchase-course-test-3.json
+++ b/spec/fixtures/db-prepaid-purchase-course-test-3.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVXKaReE7xLUdOVrQZisx",
+            "id": "tok_17IOQgKaReE7xLUd7Cj6SMxq",
             "card": {
-                "id": "card_17GCVXKaReE7xLUdFEluXOeu"
+                "id": "card_17IOQgKaReE7xLUd2XI9u2el"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUi50nXhjWn",
+            "id": "cus_7XTN61mUy646vB",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,36 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVXKaReE7xLUdFEluXOeu",
-                        "customer": "cus_7VCvUi50nXhjWn"
+                        "id": "card_17IOQgKaReE7xLUd2XI9u2el",
+                        "customer": "cus_7XTN61mUy646vB"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTN61mUy646vB",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTN61mUy646vB",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user89@me.com",
+            "metadata": {
+                "id": "000000000000000000000081"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOQgKaReE7xLUd2XI9u2el",
+                        "customer": "cus_7XTN61mUy646vB"
                     }
                 ],
                 "has_more": false
@@ -46,12 +74,12 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVYKaReE7xLUdstf63Kol",
-            "amount": 1200,
-            "customer": "cus_7VCvUi50nXhjWn",
+            "id": "ch_17IOQhKaReE7xLUd4dyiqDny",
+            "amount": 300,
+            "customer": "cus_7XTN61mUy646vB",
             "metadata": {
                 "type": "course",
-                "timestamp": "1449685063457",
+                "timestamp": "1450207546495",
                 "productID": "prepaid course"
             },
             "paid": true,
@@ -59,8 +87,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVXKaReE7xLUdFEluXOeu",
-                "customer": "cus_7VCvUi50nXhjWn"
+                "id": "card_17IOQgKaReE7xLUd2XI9u2el",
+                "customer": "cus_7XTN61mUy646vB"
             }
         }
     }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-1.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-1.json
index 9b4e85537..29377a7de 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-1.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-1.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVZKaReE7xLUdc2sd97Kh",
+            "id": "tok_17IOQiKaReE7xLUdJL3Q7JLp",
             "card": {
-                "id": "card_17GCVZKaReE7xLUdAQ3WCuCA"
+                "id": "card_17IOQiKaReE7xLUd40BrSMNC"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-2.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-2.json
index aa3b517a8..8231b9106 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-2.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-2.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVZKaReE7xLUdLm4xB9Q4",
+            "id": "tok_17IOQjKaReE7xLUdBLKEWC4R",
             "card": {
-                "id": "card_17GCVZKaReE7xLUdfv42GBHU"
+                "id": "card_17IOQjKaReE7xLUdCbcBVuuk"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-3.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-3.json
index f05b47fd1..29d20611a 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-3.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-3.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVaKaReE7xLUdQP3U2KmC",
+            "id": "tok_17IOQjKaReE7xLUdQx1dIheo",
             "card": {
-                "id": "card_17GCVaKaReE7xLUdCItK5QND"
+                "id": "card_17IOQjKaReE7xLUdPcrGFELH"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-4.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-4.json
index 9f1f67f9b..38e7d0a4b 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-4.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-4.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVaKaReE7xLUdfcArqe1K",
+            "id": "tok_17IOQkKaReE7xLUdN8oUK1vt",
             "card": {
-                "id": "card_17GCVaKaReE7xLUdQXuE34GK"
+                "id": "card_17IOQkKaReE7xLUd89WMMmJy"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-5.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-5.json
index bfd65c37e..ac4c5d575 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-5.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-5.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVaKaReE7xLUdZqrHnDcB",
+            "id": "tok_17IOQlKaReE7xLUdvcM60UvZ",
             "card": {
-                "id": "card_17GCVaKaReE7xLUdu0XGOs3Q"
+                "id": "card_17IOQlKaReE7xLUd6KipB1W5"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-6.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-6.json
index 5fe21d5cb..36c326baa 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-6.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-6.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVbKaReE7xLUdZSSwB8CG",
+            "id": "tok_17IOQmKaReE7xLUdOrulQKjc",
             "card": {
-                "id": "card_17GCVbKaReE7xLUdsdKXR63y"
+                "id": "card_17IOQmKaReE7xLUd412VlEor"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-7.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-7.json
index 958b2e9af..2d54ee15f 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-7.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-7.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVbKaReE7xLUdswrosKLO",
+            "id": "tok_17IOQmKaReE7xLUdpGCNDFq8",
             "card": {
-                "id": "card_17GCVbKaReE7xLUdiINiC8ab"
+                "id": "card_17IOQmKaReE7xLUd0t08mRbC"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-prepaid-purchase-term-sub-test-8.json b/spec/fixtures/db-prepaid-purchase-term-sub-test-8.json
index d7bbd80d9..e6cd9cc8c 100644
--- a/spec/fixtures/db-prepaid-purchase-term-sub-test-8.json
+++ b/spec/fixtures/db-prepaid-purchase-term-sub-test-8.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVcKaReE7xLUdB5HnT2wI",
+            "id": "tok_17IOQnKaReE7xLUd7vxmypxi",
             "card": {
-                "id": "card_17GCVcKaReE7xLUd7R94nEhN"
+                "id": "card_17IOQnKaReE7xLUdwvfk7NXJ"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVcKaReE7xLUd7R94nEhN",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQnKaReE7xLUdwvfk7NXJ",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -43,61 +43,78 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "normal@jo.com",
-            "metadata": {
-                "id": "000000000000000000000088"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCVcKaReE7xLUd7R94nEhN",
-                        "customer": "cus_7VCvcfu4XzeCbM"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VCvEG141oJimL",
+            "id": "sub_7XTN0j8yRl2LLW",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363470,
-            "current_period_start": 1449685070,
-            "customer": "cus_7VCvcfu4XzeCbM",
+            "current_period_end": 1452885954,
+            "current_period_start": 1450207554,
+            "customer": "cus_7XTNzqLiTWHO6t",
             "metadata": {
                 "id": "000000000000000000000088"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTNzqLiTWHO6t",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "normal@jo.com",
+            "metadata": {
+                "id": "000000000000000000000088"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOQnKaReE7xLUdwvfk7NXJ",
+                        "customer": "cus_7XTNzqLiTWHO6t"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTN0j8yRl2LLW",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885954,
+                        "current_period_start": 1450207554,
+                        "customer": "cus_7XTNzqLiTWHO6t",
+                        "metadata": {
+                            "id": "000000000000000000000088"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVfKaReE7xLUdIvigMi5U",
+            "id": "tok_17IOQqKaReE7xLUdvDFV7zxM",
             "card": {
-                "id": "card_17GCVfKaReE7xLUdks8zeqw5"
+                "id": "card_17IOQqKaReE7xLUdRqwKR3Vo"
             },
             "type": "card"
         }
@@ -105,10 +122,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -119,8 +136,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVcKaReE7xLUd7R94nEhN",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQnKaReE7xLUdwvfk7NXJ",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -128,17 +145,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvEG141oJimL",
+                        "id": "sub_7XTN0j8yRl2LLW",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363470,
-                        "current_period_start": 1449685070,
-                        "customer": "cus_7VCvcfu4XzeCbM",
+                        "current_period_end": 1452885954,
+                        "current_period_start": 1450207554,
+                        "customer": "cus_7XTNzqLiTWHO6t",
                         "metadata": {
                             "id": "000000000000000000000088"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -150,10 +167,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -164,8 +181,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVfKaReE7xLUdks8zeqw5",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQnKaReE7xLUdwvfk7NXJ",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -173,17 +190,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvEG141oJimL",
+                        "id": "sub_7XTN0j8yRl2LLW",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363470,
-                        "current_period_start": 1449685070,
-                        "customer": "cus_7VCvcfu4XzeCbM",
+                        "current_period_end": 1452885954,
+                        "current_period_start": 1450207554,
+                        "customer": "cus_7XTNzqLiTWHO6t",
                         "metadata": {
                             "id": "000000000000000000000088"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -195,10 +212,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -209,8 +226,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVfKaReE7xLUdks8zeqw5",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQqKaReE7xLUdRqwKR3Vo",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -218,17 +235,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvEG141oJimL",
+                        "id": "sub_7XTN0j8yRl2LLW",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363470,
-                        "current_period_start": 1449685070,
-                        "customer": "cus_7VCvcfu4XzeCbM",
+                        "current_period_end": 1452885954,
+                        "current_period_start": 1450207554,
+                        "customer": "cus_7XTNzqLiTWHO6t",
                         "metadata": {
                             "id": "000000000000000000000088"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -243,12 +260,12 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVgKaReE7xLUdTqpuyEWR",
-            "amount": 8991,
-            "customer": "cus_7VCvcfu4XzeCbM",
+            "id": "ch_17IOQsKaReE7xLUd6vAsPLa6",
+            "amount": 900,
+            "customer": "cus_7XTNzqLiTWHO6t",
             "metadata": {
                 "type": "terminal_subscription",
-                "timestamp": "1449685071367",
+                "timestamp": "1450207556958",
                 "months": "3",
                 "productID": "prepaid terminal_subscription"
             },
@@ -257,8 +274,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVfKaReE7xLUdks8zeqw5",
-                "customer": "cus_7VCvcfu4XzeCbM"
+                "id": "card_17IOQqKaReE7xLUdRqwKR3Vo",
+                "customer": "cus_7XTNzqLiTWHO6t"
             }
         }
     }
diff --git a/spec/fixtures/db-sub-redeem-test-1.json b/spec/fixtures/db-sub-redeem-test-1.json
index d61ffe024..b5ff9559e 100644
--- a/spec/fixtures/db-sub-redeem-test-1.json
+++ b/spec/fixtures/db-sub-redeem-test-1.json
@@ -2,10 +2,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -16,8 +16,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVfKaReE7xLUdks8zeqw5",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQqKaReE7xLUdRqwKR3Vo",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -25,17 +25,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvEG141oJimL",
+                        "id": "sub_7XTN0j8yRl2LLW",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363470,
-                        "current_period_start": 1449685070,
-                        "customer": "cus_7VCvcfu4XzeCbM",
+                        "current_period_end": 1452885954,
+                        "current_period_start": 1450207554,
+                        "customer": "cus_7XTNzqLiTWHO6t",
                         "metadata": {
                             "id": "000000000000000000000088"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -47,22 +47,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM/subscriptions",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VCvEG141oJimL",
+                    "id": "sub_7XTN0j8yRl2LLW",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452363470,
-                    "current_period_start": 1449685070,
-                    "customer": "cus_7VCvcfu4XzeCbM",
+                    "current_period_end": 1452885954,
+                    "current_period_start": 1450207554,
+                    "customer": "cus_7XTNzqLiTWHO6t",
                     "metadata": {
                         "id": "000000000000000000000088"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -73,22 +73,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM/subscriptions",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VCvEG141oJimL",
+                    "id": "sub_7XTN0j8yRl2LLW",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452363470,
-                    "current_period_start": 1449685070,
-                    "customer": "cus_7VCvcfu4XzeCbM",
+                    "current_period_end": 1452885954,
+                    "current_period_start": 1450207554,
+                    "customer": "cus_7XTNzqLiTWHO6t",
                     "metadata": {
                         "id": "000000000000000000000088"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -99,20 +99,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM/subscriptions/sub_7VCvEG141oJimL",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t/subscriptions/sub_7XTN0j8yRl2LLW",
         "status": 200,
         "response": {
-            "id": "sub_7VCvEG141oJimL",
+            "id": "sub_7XTN0j8yRl2LLW",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363470,
-            "current_period_start": 1449685070,
-            "customer": "cus_7VCvcfu4XzeCbM",
+            "current_period_end": 1452885954,
+            "current_period_start": 1450207554,
+            "customer": "cus_7XTNzqLiTWHO6t",
             "metadata": {
                 "id": "000000000000000000000088"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -120,10 +120,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
         "status": 200,
         "response": {
-            "id": "cus_7VCvcfu4XzeCbM",
+            "id": "cus_7XTNzqLiTWHO6t",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -134,8 +134,36 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVfKaReE7xLUdks8zeqw5",
-                        "customer": "cus_7VCvcfu4XzeCbM"
+                        "id": "card_17IOQqKaReE7xLUdRqwKR3Vo",
+                        "customer": "cus_7XTNzqLiTWHO6t"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTNzqLiTWHO6t",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "normal@jo.com",
+            "metadata": {
+                "id": "000000000000000000000088"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOQqKaReE7xLUdRqwKR3Vo",
+                        "customer": "cus_7XTNzqLiTWHO6t"
                     }
                 ],
                 "has_more": false
@@ -148,7 +176,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvcfu4XzeCbM/subscriptions",
+        "path": "/v1/customers/cus_7XTNzqLiTWHO6t/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
diff --git a/spec/fixtures/db-sub-redeem-test-2.json b/spec/fixtures/db-sub-redeem-test-2.json
index de39900a8..e43f52572 100644
--- a/spec/fixtures/db-sub-redeem-test-2.json
+++ b/spec/fixtures/db-sub-redeem-test-2.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVlKaReE7xLUdrgB5G5sg",
+            "id": "tok_17IOQxKaReE7xLUdIT2cvKAt",
             "card": {
-                "id": "card_17GCVkKaReE7xLUdhnarn1rx"
+                "id": "card_17IOQxKaReE7xLUdls71CTWN"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvhVTldJ0ArC",
+            "id": "cus_7XTN2QmGLf0x5K",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,36 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVkKaReE7xLUdhnarn1rx",
-                        "customer": "cus_7VCvhVTldJ0ArC"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VCvhVTldJ0ArC",
-        "status": 200,
-        "response": {
-            "id": "cus_7VCvhVTldJ0ArC",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user98@me.com",
-            "metadata": {
-                "id": "00000000000000000000008c"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCVkKaReE7xLUdhnarn1rx",
-                        "customer": "cus_7VCvhVTldJ0ArC"
+                        "id": "card_17IOQxKaReE7xLUdls71CTWN",
+                        "customer": "cus_7XTN2QmGLf0x5K"
                     }
                 ],
                 "has_more": false
@@ -74,12 +46,12 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GCVlKaReE7xLUd5D6k1v4E",
-            "amount": 2997,
-            "customer": "cus_7VCvhVTldJ0ArC",
+            "id": "ch_17IOQyKaReE7xLUdftH7lIJF",
+            "amount": 300,
+            "customer": "cus_7XTN2QmGLf0x5K",
             "metadata": {
                 "type": "terminal_subscription",
-                "timestamp": "1449685077119",
+                "timestamp": "1450207563299",
                 "months": "1",
                 "productID": "prepaid terminal_subscription"
             },
@@ -88,8 +60,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GCVkKaReE7xLUdhnarn1rx",
-                "customer": "cus_7VCvhVTldJ0ArC"
+                "id": "card_17IOQxKaReE7xLUdls71CTWN",
+                "customer": "cus_7XTN2QmGLf0x5K"
             }
         }
     }
diff --git a/spec/fixtures/db-sub-redeem-test-3.json b/spec/fixtures/db-sub-redeem-test-3.json
new file mode 100644
index 000000000..a92649f98
--- /dev/null
+++ b/spec/fixtures/db-sub-redeem-test-3.json
@@ -0,0 +1,96 @@
+[
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/tokens",
+        "status": 200,
+        "response": {
+            "id": "tok_17JTAqKaReE7xLUdjGIGtXtl",
+            "card": {
+                "id": "card_17JTAqKaReE7xLUdHHTMsz1i"
+            },
+            "type": "card"
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers",
+        "status": 200,
+        "response": {
+            "id": "cus_7YaLqXE9lrcaKy",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user32@me.com",
+            "metadata": {
+                "id": "000000000000000000000022"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17JTAqKaReE7xLUdHHTMsz1i",
+                        "customer": "cus_7YaLqXE9lrcaKy"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7YaLqXE9lrcaKy",
+        "status": 200,
+        "response": {
+            "id": "cus_7YaLqXE9lrcaKy",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user32@me.com",
+            "metadata": {
+                "id": "000000000000000000000022"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17JTAqKaReE7xLUdHHTMsz1i",
+                        "customer": "cus_7YaLqXE9lrcaKy"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/charges",
+        "status": 200,
+        "response": {
+            "id": "ch_17JTArKaReE7xLUd0YVinnrN",
+            "amount": 15000,
+            "customer": "cus_7YaLqXE9lrcaKy",
+            "metadata": {
+                "type": "terminal_subscription",
+                "timestamp": "1450464112509",
+                "months": "3",
+                "productID": "prepaid terminal_subscription"
+            },
+            "paid": true,
+            "refunds": {
+                "has_more": false
+            },
+            "source": {
+                "id": "card_17JTAqKaReE7xLUdHHTMsz1i",
+                "customer": "cus_7YaLqXE9lrcaKy"
+            }
+        }
+    }
+]
\ No newline at end of file
diff --git a/spec/fixtures/db-user-sub-test-1.json b/spec/fixtures/db-user-sub-test-1.json
index edb31a159..2e977022d 100644
--- a/spec/fixtures/db-user-sub-test-1.json
+++ b/spec/fixtures/db-user-sub-test-1.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVmKaReE7xLUd3TTueitH",
+            "id": "tok_17IOHcKaReE7xLUdfKtGmLgV",
             "card": {
-                "id": "card_17GCVmKaReE7xLUdErwdQ45K"
+                "id": "card_17IOHcKaReE7xLUdAusILb3u"
             },
             "type": "card"
         }
diff --git a/spec/fixtures/db-user-sub-test-2.json b/spec/fixtures/db-user-sub-test-2.json
index ae4fe47b2..b57053b15 100644
--- a/spec/fixtures/db-user-sub-test-2.json
+++ b/spec/fixtures/db-user-sub-test-2.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCVoKaReE7xLUdWKRMzFDb",
+            "id": "tok_17IOHeKaReE7xLUd0xVR8Qcu",
             "card": {
-                "id": "card_17GCVoKaReE7xLUdpf0crA0p"
+                "id": "card_17IOHeKaReE7xLUdsx1siboK"
             },
             "type": "card"
         }
@@ -18,7 +18,7 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -29,8 +29,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -43,20 +43,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VCvXO37PhGOUY",
+            "id": "sub_7XTEeDaljXocIE",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363481,
-            "current_period_start": 1449685081,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885387,
+            "current_period_start": 1450206987,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/db-user-sub-test-3.json b/spec/fixtures/db-user-sub-test-3.json
index 938f5bfe2..aeba40533 100644
--- a/spec/fixtures/db-user-sub-test-3.json
+++ b/spec/fixtures/db-user-sub-test-3.json
@@ -7,19 +7,19 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCVpKaReE7xLUdPDEmVDeD",
-                    "customer": "cus_7VCvUEDSyqS8aN",
+                    "id": "in_17IOHfKaReE7xLUdX74TULaM",
+                    "customer": "cus_7XTE2tCcVgwJps",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VCvXO37PhGOUY",
-                                "amount": 999,
+                                "id": "sub_7XTEeDaljXocIE",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186a1"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -29,8 +29,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VCvXO37PhGOUY",
-                    "total": 999
+                    "subscription": "sub_7XTEeDaljXocIE",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -39,22 +39,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCVpKaReE7xLUdPDEmVDeD",
+        "path": "/v1/invoices/in_17IOHfKaReE7xLUdX74TULaM",
         "status": 200,
         "response": {
-            "id": "in_17GCVpKaReE7xLUdPDEmVDeD",
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "id": "in_17IOHfKaReE7xLUdX74TULaM",
+            "customer": "cus_7XTE2tCcVgwJps",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VCvXO37PhGOUY",
-                        "amount": 999,
+                        "id": "sub_7XTEeDaljXocIE",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -64,17 +64,17 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VCvXO37PhGOUY",
-            "total": 999
+            "subscription": "sub_7XTEeDaljXocIE",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -85,8 +85,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -94,17 +94,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvXO37PhGOUY",
+                        "id": "sub_7XTEeDaljXocIE",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685081,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206987,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-user-sub-test-4.json b/spec/fixtures/db-user-sub-test-4.json
index 92340912b..c4c141892 100644
--- a/spec/fixtures/db-user-sub-test-4.json
+++ b/spec/fixtures/db-user-sub-test-4.json
@@ -2,20 +2,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions/sub_7VCvXO37PhGOUY",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions/sub_7XTEeDaljXocIE",
         "status": 200,
         "response": {
-            "id": "sub_7VCvXO37PhGOUY",
+            "id": "sub_7XTEeDaljXocIE",
             "cancel_at_period_end": true,
-            "current_period_end": 1452363481,
-            "current_period_start": 1449685081,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885387,
+            "current_period_start": 1450206987,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -23,10 +23,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -37,8 +37,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -46,17 +46,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvXO37PhGOUY",
+                        "id": "sub_7XTEeDaljXocIE",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685081,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206987,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-user-sub-test-5.json b/spec/fixtures/db-user-sub-test-5.json
index 90b5c999d..39596371d 100644
--- a/spec/fixtures/db-user-sub-test-5.json
+++ b/spec/fixtures/db-user-sub-test-5.json
@@ -2,10 +2,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -16,8 +16,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -25,17 +25,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvXO37PhGOUY",
+                        "id": "sub_7XTEeDaljXocIE",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685081,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206987,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -47,22 +47,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VCvXO37PhGOUY",
+                    "id": "sub_7XTEeDaljXocIE",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452363481,
-                    "current_period_start": 1449685081,
-                    "customer": "cus_7VCvUEDSyqS8aN",
+                    "current_period_end": 1452885387,
+                    "current_period_start": 1450206987,
+                    "customer": "cus_7XTE2tCcVgwJps",
                     "metadata": {
                         "id": "0000000000000000000186a1"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -73,20 +73,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions/sub_7VCvXO37PhGOUY",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions/sub_7XTEeDaljXocIE",
         "status": 200,
         "response": {
-            "id": "sub_7VCvXO37PhGOUY",
+            "id": "sub_7XTEeDaljXocIE",
             "cancel_at_period_end": true,
-            "current_period_end": 1452363481,
-            "current_period_start": 1449685081,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885387,
+            "current_period_start": 1450206987,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -94,20 +94,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VCv1YWFAmGmed",
+            "id": "sub_7XTE0T8sIdVZQ5",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363481,
-            "current_period_start": 1449685087,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885387,
+            "current_period_start": 1450206995,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/db-user-sub-test-6.json b/spec/fixtures/db-user-sub-test-6.json
index 2751212d6..e66eb0ce4 100644
--- a/spec/fixtures/db-user-sub-test-6.json
+++ b/spec/fixtures/db-user-sub-test-6.json
@@ -7,19 +7,19 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCVvKaReE7xLUdPf2zkiYX",
-                    "customer": "cus_7VCvUEDSyqS8aN",
+                    "id": "in_17IOHnKaReE7xLUd6zxvLsWc",
+                    "customer": "cus_7XTE2tCcVgwJps",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VCv1YWFAmGmed",
+                                "id": "sub_7XTE0T8sIdVZQ5",
                                 "amount": 0,
                                 "metadata": {
                                     "id": "0000000000000000000186a1"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -29,23 +29,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VCv1YWFAmGmed",
+                    "subscription": "sub_7XTE0T8sIdVZQ5",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCVpKaReE7xLUdPDEmVDeD",
-                    "customer": "cus_7VCvUEDSyqS8aN",
+                    "id": "in_17IOHfKaReE7xLUdX74TULaM",
+                    "customer": "cus_7XTE2tCcVgwJps",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VCvXO37PhGOUY",
-                                "amount": 999,
+                                "id": "sub_7XTEeDaljXocIE",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186a1"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -55,8 +55,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VCvXO37PhGOUY",
-                    "total": 999
+                    "subscription": "sub_7XTEeDaljXocIE",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -65,22 +65,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCVvKaReE7xLUdPf2zkiYX",
+        "path": "/v1/invoices/in_17IOHnKaReE7xLUd6zxvLsWc",
         "status": 200,
         "response": {
-            "id": "in_17GCVvKaReE7xLUdPf2zkiYX",
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "id": "in_17IOHnKaReE7xLUd6zxvLsWc",
+            "customer": "cus_7XTE2tCcVgwJps",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VCv1YWFAmGmed",
+                        "id": "sub_7XTE0T8sIdVZQ5",
                         "amount": 0,
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -90,7 +90,7 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VCv1YWFAmGmed",
+            "subscription": "sub_7XTE0T8sIdVZQ5",
             "total": 0
         }
     }
diff --git a/spec/fixtures/db-user-sub-test-7.json b/spec/fixtures/db-user-sub-test-7.json
index 1bd00595d..f027f176a 100644
--- a/spec/fixtures/db-user-sub-test-7.json
+++ b/spec/fixtures/db-user-sub-test-7.json
@@ -2,20 +2,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions/sub_7VCv1YWFAmGmed",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions/sub_7XTE0T8sIdVZQ5",
         "status": 200,
         "response": {
-            "id": "sub_7VCv1YWFAmGmed",
+            "id": "sub_7XTE0T8sIdVZQ5",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363481,
-            "current_period_start": 1449685087,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885387,
+            "current_period_start": 1450206995,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -23,10 +23,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -37,8 +37,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -46,17 +46,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCv1YWFAmGmed",
+                        "id": "sub_7XTE0T8sIdVZQ5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685087,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206995,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/db-user-sub-test-8.json b/spec/fixtures/db-user-sub-test-8.json
index 4385f4a9d..1b55e59f0 100644
--- a/spec/fixtures/db-user-sub-test-8.json
+++ b/spec/fixtures/db-user-sub-test-8.json
@@ -2,10 +2,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -16,8 +16,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -25,17 +25,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCv1YWFAmGmed",
+                        "id": "sub_7XTE0T8sIdVZQ5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685087,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206995,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -47,20 +47,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN/subscriptions",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VCvB079Vlyv2a",
+            "id": "sub_7XTEVBY1dSyi76",
             "cancel_at_period_end": false,
-            "current_period_end": 1452363490,
-            "current_period_start": 1449685090,
-            "customer": "cus_7VCvUEDSyqS8aN",
+            "current_period_end": 1452885398,
+            "current_period_start": 1450206998,
+            "customer": "cus_7XTE2tCcVgwJps",
             "metadata": {
                 "id": "0000000000000000000186a1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -68,10 +68,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -82,8 +82,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -91,92 +91,32 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvB079Vlyv2a",
+                        "id": "sub_7XTEVBY1dSyi76",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363490,
-                        "current_period_start": 1449685090,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885398,
+                        "current_period_start": 1450206998,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VCv1YWFAmGmed",
+                        "id": "sub_7XTE0T8sIdVZQ5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685087,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206995,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
-        "status": 200,
-        "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "newEmail@gmail.com",
-            "metadata": {
-                "id": "0000000000000000000186a1"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VCvB079Vlyv2a",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452363490,
-                        "current_period_start": 1449685090,
-                        "customer": "cus_7VCvUEDSyqS8aN",
-                        "metadata": {
-                            "id": "0000000000000000000186a1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VCv1YWFAmGmed",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685087,
-                        "customer": "cus_7VCvUEDSyqS8aN",
-                        "metadata": {
-                            "id": "0000000000000000000186a1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -188,10 +128,10 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VCvUEDSyqS8aN",
+        "path": "/v1/customers/cus_7XTE2tCcVgwJps",
         "status": 200,
         "response": {
-            "id": "cus_7VCvUEDSyqS8aN",
+            "id": "cus_7XTE2tCcVgwJps",
             "alipay_accounts": {
                 "has_more": false
             },
@@ -202,8 +142,8 @@
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCVoKaReE7xLUdpf0crA0p",
-                        "customer": "cus_7VCvUEDSyqS8aN"
+                        "id": "card_17IOHeKaReE7xLUdsx1siboK",
+                        "customer": "cus_7XTE2tCcVgwJps"
                     }
                 ],
                 "has_more": false
@@ -211,32 +151,32 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VCvB079Vlyv2a",
+                        "id": "sub_7XTEVBY1dSyi76",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363490,
-                        "current_period_start": 1449685090,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885398,
+                        "current_period_start": 1450206998,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VCv1YWFAmGmed",
+                        "id": "sub_7XTE0T8sIdVZQ5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452363481,
-                        "current_period_start": 1449685087,
-                        "customer": "cus_7VCvUEDSyqS8aN",
+                        "current_period_end": 1452885387,
+                        "current_period_start": 1450206995,
+                        "customer": "cus_7XTE2tCcVgwJps",
                         "metadata": {
                             "id": "0000000000000000000186a1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/sub-test-01.json b/spec/fixtures/sub-test-01.json
index 4c834a172..a9a1e1cc3 100644
--- a/spec/fixtures/sub-test-01.json
+++ b/spec/fixtures/sub-test-01.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCvTKaReE7xLUdvh4VgxLe",
+            "id": "tok_17IOHtKaReE7xLUdYKMUJxEC",
             "card": {
-                "id": "card_17GCvTKaReE7xLUdfBe38ijD"
+                "id": "card_17IOHtKaReE7xLUd733jUMJT"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMXnBgJmAcyq",
+            "id": "cus_7XTECi356XvPj7",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user100@me.com",
+            "email": "user0@me.com",
             "metadata": {
                 "id": "0000000000000000000186a2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvTKaReE7xLUdfBe38ijD",
-                        "customer": "cus_7VDMXnBgJmAcyq"
+                        "id": "card_17IOHtKaReE7xLUd733jUMJT",
+                        "customer": "cus_7XTECi356XvPj7"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMXnBgJmAcyq",
+        "path": "/v1/customers/cus_7XTECi356XvPj7",
         "status": 200,
         "response": {
-            "id": "cus_7VDMXnBgJmAcyq",
+            "id": "cus_7XTECi356XvPj7",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user100@me.com",
+            "email": "user0@me.com",
             "metadata": {
                 "id": "0000000000000000000186a2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvTKaReE7xLUdfBe38ijD",
-                        "customer": "cus_7VDMXnBgJmAcyq"
+                        "id": "card_17IOHtKaReE7xLUd733jUMJT",
+                        "customer": "cus_7XTECi356XvPj7"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMXnBgJmAcyq/subscriptions",
+        "path": "/v1/customers/cus_7XTECi356XvPj7/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDMPjS8P0Au1a",
+            "id": "sub_7XTENHWJPvw2i7",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365072,
-            "current_period_start": 1449686672,
-            "customer": "cus_7VDMXnBgJmAcyq",
+            "current_period_end": 1452885402,
+            "current_period_start": 1450207002,
+            "customer": "cus_7XTECi356XvPj7",
             "metadata": {
                 "id": "0000000000000000000186a2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-02.json b/spec/fixtures/sub-test-02.json
index d60bb4008..4366605da 100644
--- a/spec/fixtures/sub-test-02.json
+++ b/spec/fixtures/sub-test-02.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCvVKaReE7xLUdWKG9Sa0e",
+            "id": "tok_17IOHwKaReE7xLUdBH10GZUD",
             "card": {
-                "id": "card_17GCvVKaReE7xLUdcFaT6hqy"
+                "id": "card_17IOHwKaReE7xLUdl9pvVGBc"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMJJrLqZe8Wi",
+            "id": "cus_7XTEC7EMnN5Efg",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user101@me.com",
+            "email": "user1@me.com",
             "metadata": {
                 "id": "0000000000000000000186a3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvVKaReE7xLUdcFaT6hqy",
-                        "customer": "cus_7VDMJJrLqZe8Wi"
+                        "id": "card_17IOHwKaReE7xLUdl9pvVGBc",
+                        "customer": "cus_7XTEC7EMnN5Efg"
                     }
                 ],
                 "has_more": false
@@ -43,20 +43,48 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMJJrLqZe8Wi/subscriptions",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg",
         "status": 200,
         "response": {
-            "id": "sub_7VDMlTOqYJPAT3",
+            "id": "cus_7XTEC7EMnN5Efg",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user1@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a3"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOHwKaReE7xLUdl9pvVGBc",
+                        "customer": "cus_7XTEC7EMnN5Efg"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTESrfxh2hKJD",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365074,
-            "current_period_start": 1449686674,
-            "customer": "cus_7VDMJJrLqZe8Wi",
+            "current_period_end": 1452885405,
+            "current_period_start": 1450207005,
+            "customer": "cus_7XTEC7EMnN5Efg",
             "metadata": {
                 "id": "0000000000000000000186a3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -64,22 +92,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMJJrLqZe8Wi",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg",
         "status": 200,
         "response": {
-            "id": "cus_7VDMJJrLqZe8Wi",
+            "id": "cus_7XTEC7EMnN5Efg",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user101@me.com",
+            "email": "user1@me.com",
             "metadata": {
                 "id": "0000000000000000000186a3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvVKaReE7xLUdcFaT6hqy",
-                        "customer": "cus_7VDMJJrLqZe8Wi"
+                        "id": "card_17IOHwKaReE7xLUdl9pvVGBc",
+                        "customer": "cus_7XTEC7EMnN5Efg"
                     }
                 ],
                 "has_more": false
@@ -87,17 +115,62 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMlTOqYJPAT3",
+                        "id": "sub_7XTESrfxh2hKJD",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365074,
-                        "current_period_start": 1449686674,
-                        "customer": "cus_7VDMJJrLqZe8Wi",
+                        "current_period_end": 1452885405,
+                        "current_period_start": 1450207005,
+                        "customer": "cus_7XTEC7EMnN5Efg",
                         "metadata": {
                             "id": "0000000000000000000186a3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTEC7EMnN5Efg",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user1@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a3"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOHwKaReE7xLUdl9pvVGBc",
+                        "customer": "cus_7XTEC7EMnN5Efg"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTESrfxh2hKJD",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885405,
+                        "current_period_start": 1450207005,
+                        "customer": "cus_7XTEC7EMnN5Efg",
+                        "metadata": {
+                            "id": "0000000000000000000186a3"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -109,86 +182,41 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDMJJrLqZe8Wi/subscriptions/sub_7VDMlTOqYJPAT3",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg/subscriptions/sub_7XTESrfxh2hKJD",
         "status": 200,
         "response": {
-            "id": "sub_7VDMlTOqYJPAT3",
+            "id": "sub_7XTESrfxh2hKJD",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365074,
-            "current_period_start": 1449686674,
-            "customer": "cus_7VDMJJrLqZe8Wi",
+            "current_period_end": 1452885405,
+            "current_period_start": 1450207005,
+            "customer": "cus_7XTEC7EMnN5Efg",
             "metadata": {
                 "id": "0000000000000000000186a3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMJJrLqZe8Wi",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMJJrLqZe8Wi",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user101@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a3"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvVKaReE7xLUdcFaT6hqy",
-                        "customer": "cus_7VDMJJrLqZe8Wi"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMlTOqYJPAT3",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365074,
-                        "current_period_start": 1449686674,
-                        "customer": "cus_7VDMJJrLqZe8Wi",
-                        "metadata": {
-                            "id": "0000000000000000000186a3"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMJJrLqZe8Wi/subscriptions/sub_7VDMlTOqYJPAT3",
+        "path": "/v1/customers/cus_7XTEC7EMnN5Efg/subscriptions/sub_7XTESrfxh2hKJD",
         "status": 200,
         "response": {
-            "id": "sub_7VDMlTOqYJPAT3",
+            "id": "sub_7XTESrfxh2hKJD",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365074,
-            "current_period_start": 1449686674,
-            "customer": "cus_7VDMJJrLqZe8Wi",
+            "current_period_end": 1452885405,
+            "current_period_start": 1450207005,
+            "customer": "cus_7XTEC7EMnN5Efg",
             "metadata": {
                 "id": "0000000000000000000186a3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-03.json b/spec/fixtures/sub-test-03.json
index 6cb01f957..39a0d135f 100644
--- a/spec/fixtures/sub-test-03.json
+++ b/spec/fixtures/sub-test-03.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCvZKaReE7xLUdypujc0WH",
+            "id": "tok_17IOI1KaReE7xLUd7QELQWlb",
             "card": {
-                "id": "card_17GCvZKaReE7xLUdwixI8vqT"
+                "id": "card_17IOI1KaReE7xLUdk7p00M2y"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMp8mEu4xG73",
+            "id": "cus_7XTE4JmrUGrwa4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user102@me.com",
+            "email": "user2@me.com",
             "metadata": {
                 "id": "0000000000000000000186a4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
+                        "id": "card_17IOI1KaReE7xLUdk7p00M2y",
+                        "customer": "cus_7XTE4JmrUGrwa4"
                     }
                 ],
                 "has_more": false
@@ -43,69 +43,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDMp8mEu4xG73",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user102@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a4"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMsEr2xRuaqt",
+            "id": "sub_7XTE0asmtA1btp",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365079,
-            "current_period_start": 1449686679,
-            "customer": "cus_7VDMp8mEu4xG73",
+            "current_period_end": 1452885410,
+            "current_period_start": 1450207010,
+            "customer": "cus_7XTE4JmrUGrwa4",
             "metadata": {
                 "id": "0000000000000000000186a4"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73/subscriptions/sub_7VDMsEr2xRuaqt",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMsEr2xRuaqt",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365079,
-            "current_period_start": 1449686679,
-            "customer": "cus_7VDMp8mEu4xG73",
-            "metadata": {
-                "id": "0000000000000000000186a4"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -113,22 +64,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4",
         "status": 200,
         "response": {
-            "id": "cus_7VDMp8mEu4xG73",
+            "id": "cus_7XTE4JmrUGrwa4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user102@me.com",
+            "email": "user2@me.com",
             "metadata": {
                 "id": "0000000000000000000186a4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
+                        "id": "card_17IOI1KaReE7xLUdk7p00M2y",
+                        "customer": "cus_7XTE4JmrUGrwa4"
                     }
                 ],
                 "has_more": false
@@ -136,17 +87,128 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMsEr2xRuaqt",
+                        "id": "sub_7XTE0asmtA1btp",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365079,
-                        "current_period_start": 1449686679,
-                        "customer": "cus_7VDMp8mEu4xG73",
+                        "current_period_end": 1452885410,
+                        "current_period_start": 1450207010,
+                        "customer": "cus_7XTE4JmrUGrwa4",
                         "metadata": {
                             "id": "0000000000000000000186a4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4/subscriptions/sub_7XTE0asmtA1btp",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTE0asmtA1btp",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885410,
+            "current_period_start": 1450207010,
+            "customer": "cus_7XTE4JmrUGrwa4",
+            "metadata": {
+                "id": "0000000000000000000186a4"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTE4JmrUGrwa4",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user2@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a4"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOI1KaReE7xLUdk7p00M2y",
+                        "customer": "cus_7XTE4JmrUGrwa4"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTE0asmtA1btp",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885410,
+                        "current_period_start": 1450207010,
+                        "customer": "cus_7XTE4JmrUGrwa4",
+                        "metadata": {
+                            "id": "0000000000000000000186a4"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTE4JmrUGrwa4",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user2@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a4"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOI1KaReE7xLUdk7p00M2y",
+                        "customer": "cus_7XTE4JmrUGrwa4"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTE0asmtA1btp",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885410,
+                        "current_period_start": 1450207010,
+                        "customer": "cus_7XTE4JmrUGrwa4",
+                        "metadata": {
+                            "id": "0000000000000000000186a4"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -158,133 +220,43 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73/subscriptions/sub_7VDMsEr2xRuaqt",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4/subscriptions/sub_7XTE0asmtA1btp",
         "status": 200,
         "response": {
-            "id": "sub_7VDMsEr2xRuaqt",
+            "id": "sub_7XTE0asmtA1btp",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365079,
-            "current_period_start": 1449686679,
-            "customer": "cus_7VDMp8mEu4xG73",
+            "current_period_end": 1452885410,
+            "current_period_start": 1450207010,
+            "customer": "cus_7XTE4JmrUGrwa4",
             "metadata": {
                 "id": "0000000000000000000186a4"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMp8mEu4xG73",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user102@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a4"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMsEr2xRuaqt",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365079,
-                        "current_period_start": 1449686679,
-                        "customer": "cus_7VDMp8mEu4xG73",
-                        "metadata": {
-                            "id": "0000000000000000000186a4"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMp8mEu4xG73",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user102@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a4"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMsEr2xRuaqt",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365079,
-                        "current_period_start": 1449686679,
-                        "customer": "cus_7VDMp8mEu4xG73",
-                        "metadata": {
-                            "id": "0000000000000000000186a4"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMp8mEu4xG73",
+        "path": "/v1/customers/cus_7XTE4JmrUGrwa4",
         "status": 200,
         "response": {
-            "id": "cus_7VDMp8mEu4xG73",
+            "id": "cus_7XTE4JmrUGrwa4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user102@me.com",
+            "email": "user2@me.com",
             "metadata": {
                 "id": "0000000000000000000186a4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvZKaReE7xLUdwixI8vqT",
-                        "customer": "cus_7VDMp8mEu4xG73"
+                        "id": "card_17IOI1KaReE7xLUdk7p00M2y",
+                        "customer": "cus_7XTE4JmrUGrwa4"
                     }
                 ],
                 "has_more": false
@@ -292,17 +264,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMsEr2xRuaqt",
+                        "id": "sub_7XTE0asmtA1btp",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365079,
-                        "current_period_start": 1449686679,
-                        "customer": "cus_7VDMp8mEu4xG73",
+                        "current_period_end": 1452885410,
+                        "current_period_start": 1450207010,
+                        "customer": "cus_7XTE4JmrUGrwa4",
                         "metadata": {
                             "id": "0000000000000000000186a4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/sub-test-04.json b/spec/fixtures/sub-test-04.json
index ba64fb66a..e575efc01 100644
--- a/spec/fixtures/sub-test-04.json
+++ b/spec/fixtures/sub-test-04.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
+            "id": "cus_7XTE4KBiF0t9qc",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user103@me.com",
+            "email": "user3@me.com",
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
@@ -24,49 +24,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user103@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a5"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMXEkJJaHxwy",
+            "id": "sub_7XTE07idZi6fEN",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365082,
-            "current_period_start": 1449686682,
-            "customer": "cus_7VDMrdFayaY59E",
+            "current_period_end": 1452885416,
+            "current_period_start": 1450207016,
+            "customer": "cus_7XTE4KBiF0t9qc",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMrdFayaY59E",
-                "subscription": "sub_7VDMXEkJJaHxwy"
+                "customer": "cus_7XTE4KBiF0t9qc",
+                "subscription": "sub_7XTE07idZi6fEN"
             },
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -74,14 +52,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
+            "id": "cus_7XTE4KBiF0t9qc",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user103@me.com",
+            "email": "user3@me.com",
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
@@ -91,24 +69,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMXEkJJaHxwy",
+                        "id": "sub_7XTE07idZi6fEN",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365082,
-                        "current_period_start": 1449686682,
-                        "customer": "cus_7VDMrdFayaY59E",
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMrdFayaY59E",
-                            "subscription": "sub_7VDMXEkJJaHxwy"
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -120,14 +98,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
+            "id": "cus_7XTE4KBiF0t9qc",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user103@me.com",
+            "email": "user3@me.com",
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
@@ -137,24 +115,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMXEkJJaHxwy",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365082,
-                        "current_period_start": 1449686682,
-                        "customer": "cus_7VDMrdFayaY59E",
+                        "id": "sub_7XTE07idZi6fEN",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMrdFayaY59E",
-                            "subscription": "sub_7VDMXEkJJaHxwy"
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -166,83 +144,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E/subscriptions/sub_7VDMXEkJJaHxwy",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc/subscriptions/sub_7XTE07idZi6fEN",
         "status": 200,
         "response": {
-            "id": "sub_7VDMXEkJJaHxwy",
+            "id": "sub_7XTE07idZi6fEN",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365082,
-            "current_period_start": 1449686682,
-            "customer": "cus_7VDMrdFayaY59E",
+            "current_period_end": 1452885416,
+            "current_period_start": 1450207016,
+            "customer": "cus_7XTE4KBiF0t9qc",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMrdFayaY59E",
-                "subscription": "sub_7VDMXEkJJaHxwy"
+                "customer": "cus_7XTE4KBiF0t9qc",
+                "subscription": "sub_7XTE07idZi6fEN"
             },
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E/subscriptions/sub_7VDMXEkJJaHxwy",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMXEkJJaHxwy",
-            "cancel_at_period_end": true,
-            "current_period_end": 1452365082,
-            "current_period_start": 1449686682,
-            "customer": "cus_7VDMrdFayaY59E",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDMrdFayaY59E",
-                "subscription": "sub_7VDMXEkJJaHxwy"
-            },
-            "metadata": {
-                "id": "0000000000000000000186a5"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E/subscriptions/sub_7VDMXEkJJaHxwy",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMXEkJJaHxwy",
-            "cancel_at_period_end": true,
-            "current_period_end": 1452365082,
-            "current_period_start": 1449686682,
-            "customer": "cus_7VDMrdFayaY59E",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDMrdFayaY59E",
-                "subscription": "sub_7VDMXEkJJaHxwy"
-            },
-            "metadata": {
-                "id": "0000000000000000000186a5"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -250,14 +172,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
+            "id": "cus_7XTE4KBiF0t9qc",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user103@me.com",
+            "email": "user3@me.com",
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
@@ -267,70 +189,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMXEkJJaHxwy",
+                        "id": "sub_7XTE07idZi6fEN",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365082,
-                        "current_period_start": 1449686682,
-                        "customer": "cus_7VDMrdFayaY59E",
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMrdFayaY59E",
-                            "subscription": "sub_7VDMXEkJJaHxwy"
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMrdFayaY59E",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user103@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a5"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMXEkJJaHxwy",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365082,
-                        "current_period_start": 1449686682,
-                        "customer": "cus_7VDMrdFayaY59E",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMrdFayaY59E",
-                            "subscription": "sub_7VDMXEkJJaHxwy"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a5"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -342,14 +218,42 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMrdFayaY59E",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc/subscriptions/sub_7XTE07idZi6fEN",
         "status": 200,
         "response": {
-            "id": "cus_7VDMrdFayaY59E",
+            "id": "sub_7XTE07idZi6fEN",
+            "cancel_at_period_end": true,
+            "current_period_end": 1452885416,
+            "current_period_start": 1450207016,
+            "customer": "cus_7XTE4KBiF0t9qc",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTE4KBiF0t9qc",
+                "subscription": "sub_7XTE07idZi6fEN"
+            },
+            "metadata": {
+                "id": "0000000000000000000186a5"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTE4KBiF0t9qc",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user103@me.com",
+            "email": "user3@me.com",
             "metadata": {
                 "id": "0000000000000000000186a5"
             },
@@ -359,24 +263,144 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMXEkJJaHxwy",
+                        "id": "sub_7XTE07idZi6fEN",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365082,
-                        "current_period_start": 1449686682,
-                        "customer": "cus_7VDMrdFayaY59E",
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMrdFayaY59E",
-                            "subscription": "sub_7VDMXEkJJaHxwy"
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc/subscriptions/sub_7XTE07idZi6fEN",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTE07idZi6fEN",
+            "cancel_at_period_end": true,
+            "current_period_end": 1452885416,
+            "current_period_start": 1450207016,
+            "customer": "cus_7XTE4KBiF0t9qc",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTE4KBiF0t9qc",
+                "subscription": "sub_7XTE07idZi6fEN"
+            },
+            "metadata": {
+                "id": "0000000000000000000186a5"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTE4KBiF0t9qc",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user3@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a5"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTE07idZi6fEN",
+                        "cancel_at_period_end": true,
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186a5"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTE4KBiF0t9qc",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTE4KBiF0t9qc",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user3@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a5"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTE07idZi6fEN",
+                        "cancel_at_period_end": true,
+                        "current_period_end": 1452885416,
+                        "current_period_start": 1450207016,
+                        "customer": "cus_7XTE4KBiF0t9qc",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTE4KBiF0t9qc",
+                            "subscription": "sub_7XTE07idZi6fEN"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186a5"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
diff --git a/spec/fixtures/sub-test-05.json b/spec/fixtures/sub-test-05.json
index 2c419c466..9067f2eac 100644
--- a/spec/fixtures/sub-test-05.json
+++ b/spec/fixtures/sub-test-05.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCviKaReE7xLUdllfxgDvw",
+            "id": "tok_17IOIBKaReE7xLUdiD2Hu8wn",
             "card": {
-                "id": "card_17GCviKaReE7xLUdGzwk7E0z"
+                "id": "card_17IOIBKaReE7xLUd8MGoj8Wo"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDM2IPe2orhRh",
+            "id": "cus_7XTEDqzY2KTAnv",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user104@me.com",
+            "email": "user4@me.com",
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCviKaReE7xLUdGzwk7E0z",
-                        "customer": "cus_7VDM2IPe2orhRh"
+                        "id": "card_17IOIBKaReE7xLUd8MGoj8Wo",
+                        "customer": "cus_7XTEDqzY2KTAnv"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv",
         "status": 200,
         "response": {
-            "id": "cus_7VDM2IPe2orhRh",
+            "id": "cus_7XTEDqzY2KTAnv",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user104@me.com",
+            "email": "user4@me.com",
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCviKaReE7xLUdGzwk7E0z",
-                        "customer": "cus_7VDM2IPe2orhRh"
+                        "id": "card_17IOIBKaReE7xLUd8MGoj8Wo",
+                        "customer": "cus_7XTEDqzY2KTAnv"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh/subscriptions",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDMhuoq3WA88F",
+            "id": "sub_7XTEJXqrdyq04u",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365087,
-            "current_period_start": 1449686687,
-            "customer": "cus_7VDM2IPe2orhRh",
+            "current_period_end": 1452885421,
+            "current_period_start": 1450207021,
+            "customer": "cus_7XTEDqzY2KTAnv",
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -92,22 +92,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv",
         "status": 200,
         "response": {
-            "id": "cus_7VDM2IPe2orhRh",
+            "id": "cus_7XTEDqzY2KTAnv",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user104@me.com",
+            "email": "user4@me.com",
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCviKaReE7xLUdGzwk7E0z",
-                        "customer": "cus_7VDM2IPe2orhRh"
+                        "id": "card_17IOIBKaReE7xLUd8MGoj8Wo",
+                        "customer": "cus_7XTEDqzY2KTAnv"
                     }
                 ],
                 "has_more": false
@@ -115,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMhuoq3WA88F",
+                        "id": "sub_7XTEJXqrdyq04u",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365087,
-                        "current_period_start": 1449686687,
-                        "customer": "cus_7VDM2IPe2orhRh",
+                        "current_period_end": 1452885421,
+                        "current_period_start": 1450207021,
+                        "customer": "cus_7XTEDqzY2KTAnv",
                         "metadata": {
                             "id": "0000000000000000000186a6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -137,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv",
         "status": 200,
         "response": {
-            "id": "cus_7VDM2IPe2orhRh",
+            "id": "cus_7XTEDqzY2KTAnv",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user104@me.com",
+            "email": "user4@me.com",
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCviKaReE7xLUdGzwk7E0z",
-                        "customer": "cus_7VDM2IPe2orhRh"
+                        "id": "card_17IOIBKaReE7xLUd8MGoj8Wo",
+                        "customer": "cus_7XTEDqzY2KTAnv"
                     }
                 ],
                 "has_more": false
@@ -160,17 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMhuoq3WA88F",
+                        "id": "sub_7XTEJXqrdyq04u",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365087,
-                        "current_period_start": 1449686687,
-                        "customer": "cus_7VDM2IPe2orhRh",
+                        "current_period_end": 1452885421,
+                        "current_period_start": 1450207021,
+                        "customer": "cus_7XTEDqzY2KTAnv",
                         "metadata": {
                             "id": "0000000000000000000186a6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh/subscriptions",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDMhuoq3WA88F",
+                    "id": "sub_7XTEJXqrdyq04u",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365087,
-                    "current_period_start": 1449686687,
-                    "customer": "cus_7VDM2IPe2orhRh",
+                    "current_period_end": 1452885421,
+                    "current_period_start": 1450207021,
+                    "customer": "cus_7XTEDqzY2KTAnv",
                     "metadata": {
                         "id": "0000000000000000000186a6"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -208,27 +208,72 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh/subscriptions/sub_7VDMhuoq3WA88F",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv",
         "status": 200,
         "response": {
-            "id": "sub_7VDMhuoq3WA88F",
+            "id": "cus_7XTEDqzY2KTAnv",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user4@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a6"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIBKaReE7xLUd8MGoj8Wo",
+                        "customer": "cus_7XTEDqzY2KTAnv"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTEJXqrdyq04u",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885421,
+                        "current_period_start": 1450207021,
+                        "customer": "cus_7XTEDqzY2KTAnv",
+                        "metadata": {
+                            "id": "0000000000000000000186a6"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv/subscriptions/sub_7XTEJXqrdyq04u",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTEJXqrdyq04u",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365087,
-            "current_period_start": 1449686687,
-            "customer": "cus_7VDM2IPe2orhRh",
+            "current_period_end": 1452885421,
+            "current_period_start": 1450207021,
+            "customer": "cus_7XTEDqzY2KTAnv",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM2IPe2orhRh",
-                "subscription": "sub_7VDMhuoq3WA88F"
+                "customer": "cus_7XTEDqzY2KTAnv",
+                "subscription": "sub_7XTEJXqrdyq04u"
             },
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -236,27 +281,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM2IPe2orhRh/subscriptions/sub_7VDMhuoq3WA88F",
+        "path": "/v1/customers/cus_7XTEDqzY2KTAnv/subscriptions/sub_7XTEJXqrdyq04u",
         "status": 200,
         "response": {
-            "id": "sub_7VDMhuoq3WA88F",
+            "id": "sub_7XTEJXqrdyq04u",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365087,
-            "current_period_start": 1449686687,
-            "customer": "cus_7VDM2IPe2orhRh",
+            "current_period_end": 1452885421,
+            "current_period_start": 1450207021,
+            "customer": "cus_7XTEDqzY2KTAnv",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM2IPe2orhRh",
-                "subscription": "sub_7VDMhuoq3WA88F"
+                "customer": "cus_7XTEDqzY2KTAnv",
+                "subscription": "sub_7XTEJXqrdyq04u"
             },
             "metadata": {
                 "id": "0000000000000000000186a6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-06.json b/spec/fixtures/sub-test-06.json
index 2238f90ea..d036c51ab 100644
--- a/spec/fixtures/sub-test-06.json
+++ b/spec/fixtures/sub-test-06.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCvmKaReE7xLUdhtUTyZlL",
+            "id": "tok_17IOIHKaReE7xLUdmriHfQoq",
             "card": {
-                "id": "card_17GCvmKaReE7xLUdt7Yh7qGx"
+                "id": "card_17IOIHKaReE7xLUd3FawOt8z"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
+            "id": "cus_7XTExVbH11phll",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user105@me.com",
+            "email": "user5@me.com",
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
+                        "id": "card_17IOIHKaReE7xLUd3FawOt8z",
+                        "customer": "cus_7XTExVbH11phll"
                     }
                 ],
                 "has_more": false
@@ -43,20 +43,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg/subscriptions",
+        "path": "/v1/customers/cus_7XTExVbH11phll/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDMS0xOsHmoQm",
+            "id": "sub_7XTEFvKO5MQIbX",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365091,
-            "current_period_start": 1449686691,
-            "customer": "cus_7VDMN7D1kvr7Lg",
+            "current_period_end": 1452885426,
+            "current_period_start": 1450207026,
+            "customer": "cus_7XTExVbH11phll",
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -64,22 +64,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
+        "path": "/v1/customers/cus_7XTExVbH11phll",
         "status": 200,
         "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
+            "id": "cus_7XTExVbH11phll",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user105@me.com",
+            "email": "user5@me.com",
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
+                        "id": "card_17IOIHKaReE7xLUd3FawOt8z",
+                        "customer": "cus_7XTExVbH11phll"
                     }
                 ],
                 "has_more": false
@@ -87,17 +87,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMS0xOsHmoQm",
+                        "id": "sub_7XTEFvKO5MQIbX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
+                        "current_period_end": 1452885426,
+                        "current_period_start": 1450207026,
+                        "customer": "cus_7XTExVbH11phll",
                         "metadata": {
                             "id": "0000000000000000000186a7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -109,22 +109,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
+        "path": "/v1/customers/cus_7XTExVbH11phll",
         "status": 200,
         "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
+            "id": "cus_7XTExVbH11phll",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user105@me.com",
+            "email": "user5@me.com",
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
+                        "id": "card_17IOIHKaReE7xLUd3FawOt8z",
+                        "customer": "cus_7XTExVbH11phll"
                     }
                 ],
                 "has_more": false
@@ -132,17 +132,62 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMS0xOsHmoQm",
+                        "id": "sub_7XTEFvKO5MQIbX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
+                        "current_period_end": 1452885426,
+                        "current_period_start": 1450207026,
+                        "customer": "cus_7XTExVbH11phll",
                         "metadata": {
                             "id": "0000000000000000000186a7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTExVbH11phll",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTExVbH11phll",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user5@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a7"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIHKaReE7xLUd3FawOt8z",
+                        "customer": "cus_7XTExVbH11phll"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTEFvKO5MQIbX",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885426,
+                        "current_period_start": 1450207026,
+                        "customer": "cus_7XTExVbH11phll",
+                        "metadata": {
+                            "id": "0000000000000000000186a7"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -154,22 +199,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
+        "path": "/v1/customers/cus_7XTExVbH11phll",
         "status": 200,
         "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
+            "id": "cus_7XTExVbH11phll",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user105@me.com",
+            "email": "user5@me.com",
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
+                        "id": "card_17IOIHKaReE7xLUd3FawOt8z",
+                        "customer": "cus_7XTExVbH11phll"
                     }
                 ],
                 "has_more": false
@@ -177,17 +222,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMS0xOsHmoQm",
+                        "id": "sub_7XTEFvKO5MQIbX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
+                        "current_period_end": 1452885426,
+                        "current_period_start": 1450207026,
+                        "customer": "cus_7XTExVbH11phll",
                         "metadata": {
                             "id": "0000000000000000000186a7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -199,67 +244,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user105@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMS0xOsHmoQm",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
-                        "metadata": {
-                            "id": "0000000000000000000186a7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg/subscriptions",
+        "path": "/v1/customers/cus_7XTExVbH11phll/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDMS0xOsHmoQm",
+                    "id": "sub_7XTEFvKO5MQIbX",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365091,
-                    "current_period_start": 1449686691,
-                    "customer": "cus_7VDMN7D1kvr7Lg",
+                    "current_period_end": 1452885426,
+                    "current_period_start": 1450207026,
+                    "customer": "cus_7XTExVbH11phll",
                     "metadata": {
                         "id": "0000000000000000000186a7"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -270,159 +270,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg/subscriptions/sub_7VDMS0xOsHmoQm",
+        "path": "/v1/customers/cus_7XTExVbH11phll/subscriptions/sub_7XTEFvKO5MQIbX",
         "status": 200,
         "response": {
-            "id": "sub_7VDMS0xOsHmoQm",
+            "id": "sub_7XTEFvKO5MQIbX",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365091,
-            "current_period_start": 1449686691,
-            "customer": "cus_7VDMN7D1kvr7Lg",
+            "current_period_end": 1452885426,
+            "current_period_start": 1450207026,
+            "customer": "cus_7XTExVbH11phll",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMN7D1kvr7Lg",
-                "subscription": "sub_7VDMS0xOsHmoQm"
+                "customer": "cus_7XTExVbH11phll",
+                "subscription": "sub_7XTEFvKO5MQIbX"
             },
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user105@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMS0xOsHmoQm",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMN7D1kvr7Lg",
-                            "subscription": "sub_7VDMS0xOsHmoQm"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMN7D1kvr7Lg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user105@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCvmKaReE7xLUdt7Yh7qGx",
-                        "customer": "cus_7VDMN7D1kvr7Lg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMS0xOsHmoQm",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365091,
-                        "current_period_start": 1449686691,
-                        "customer": "cus_7VDMN7D1kvr7Lg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMN7D1kvr7Lg",
-                            "subscription": "sub_7VDMS0xOsHmoQm"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMN7D1kvr7Lg/subscriptions/sub_7VDMS0xOsHmoQm",
+        "path": "/v1/customers/cus_7XTExVbH11phll/subscriptions/sub_7XTEFvKO5MQIbX",
         "status": 200,
         "response": {
-            "id": "sub_7VDMS0xOsHmoQm",
+            "id": "sub_7XTEFvKO5MQIbX",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365091,
-            "current_period_start": 1449686691,
-            "customer": "cus_7VDMN7D1kvr7Lg",
+            "current_period_end": 1452885426,
+            "current_period_start": 1450207026,
+            "customer": "cus_7XTExVbH11phll",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMN7D1kvr7Lg",
-                "subscription": "sub_7VDMS0xOsHmoQm"
+                "customer": "cus_7XTExVbH11phll",
+                "subscription": "sub_7XTEFvKO5MQIbX"
             },
             "metadata": {
                 "id": "0000000000000000000186a7"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-07.json b/spec/fixtures/sub-test-07.json
index 84f1d802e..64a0ee576 100644
--- a/spec/fixtures/sub-test-07.json
+++ b/spec/fixtures/sub-test-07.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDM1shFX6QRWx",
+            "id": "cus_7XTERXvcvYy1AM",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user106@me.com",
+            "email": "user6@me.com",
             "metadata": {
                 "id": "0000000000000000000186a8"
             },
@@ -24,27 +24,49 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx/subscriptions",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM",
         "status": 200,
         "response": {
-            "id": "sub_7VDMq59qAI6tOe",
+            "id": "cus_7XTERXvcvYy1AM",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user6@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a8"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTEl4bpPGHI5M",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365098,
-            "current_period_start": 1449686698,
-            "customer": "cus_7VDM1shFX6QRWx",
+            "current_period_end": 1452885431,
+            "current_period_start": 1450207031,
+            "customer": "cus_7XTERXvcvYy1AM",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM1shFX6QRWx",
-                "subscription": "sub_7VDMq59qAI6tOe"
+                "customer": "cus_7XTERXvcvYy1AM",
+                "subscription": "sub_7XTEl4bpPGHI5M"
             },
             "metadata": {
                 "id": "0000000000000000000186a8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -52,14 +74,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM",
         "status": 200,
         "response": {
-            "id": "cus_7VDM1shFX6QRWx",
+            "id": "cus_7XTERXvcvYy1AM",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user106@me.com",
+            "email": "user6@me.com",
             "metadata": {
                 "id": "0000000000000000000186a8"
             },
@@ -69,24 +91,70 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMq59qAI6tOe",
+                        "id": "sub_7XTEl4bpPGHI5M",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365098,
-                        "current_period_start": 1449686698,
-                        "customer": "cus_7VDM1shFX6QRWx",
+                        "current_period_end": 1452885431,
+                        "current_period_start": 1450207031,
+                        "customer": "cus_7XTERXvcvYy1AM",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDM1shFX6QRWx",
-                            "subscription": "sub_7VDMq59qAI6tOe"
+                            "customer": "cus_7XTERXvcvYy1AM",
+                            "subscription": "sub_7XTEl4bpPGHI5M"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTERXvcvYy1AM",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user6@me.com",
+            "metadata": {
+                "id": "0000000000000000000186a8"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTEl4bpPGHI5M",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885431,
+                        "current_period_start": 1450207031,
+                        "customer": "cus_7XTERXvcvYy1AM",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTERXvcvYy1AM",
+                            "subscription": "sub_7XTEl4bpPGHI5M"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186a8"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -98,147 +166,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx/subscriptions/sub_7VDMq59qAI6tOe",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM/subscriptions/sub_7XTEl4bpPGHI5M",
         "status": 200,
         "response": {
-            "id": "sub_7VDMq59qAI6tOe",
+            "id": "sub_7XTEl4bpPGHI5M",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365098,
-            "current_period_start": 1449686698,
-            "customer": "cus_7VDM1shFX6QRWx",
+            "current_period_end": 1452885431,
+            "current_period_start": 1450207031,
+            "customer": "cus_7XTERXvcvYy1AM",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM1shFX6QRWx",
-                "subscription": "sub_7VDMq59qAI6tOe"
+                "customer": "cus_7XTERXvcvYy1AM",
+                "subscription": "sub_7XTEl4bpPGHI5M"
             },
             "metadata": {
                 "id": "0000000000000000000186a8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDM1shFX6QRWx",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user106@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a8"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMq59qAI6tOe",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365098,
-                        "current_period_start": 1449686698,
-                        "customer": "cus_7VDM1shFX6QRWx",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDM1shFX6QRWx",
-                            "subscription": "sub_7VDMq59qAI6tOe"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a8"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDM1shFX6QRWx",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user106@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a8"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMq59qAI6tOe",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365098,
-                        "current_period_start": 1449686698,
-                        "customer": "cus_7VDM1shFX6QRWx",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDM1shFX6QRWx",
-                            "subscription": "sub_7VDMq59qAI6tOe"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a8"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM1shFX6QRWx/subscriptions/sub_7VDMq59qAI6tOe",
+        "path": "/v1/customers/cus_7XTERXvcvYy1AM/subscriptions/sub_7XTEl4bpPGHI5M",
         "status": 200,
         "response": {
-            "id": "sub_7VDMq59qAI6tOe",
+            "id": "sub_7XTEl4bpPGHI5M",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365098,
-            "current_period_start": 1449686698,
-            "customer": "cus_7VDM1shFX6QRWx",
+            "current_period_end": 1452885431,
+            "current_period_start": 1450207031,
+            "customer": "cus_7XTERXvcvYy1AM",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM1shFX6QRWx",
-                "subscription": "sub_7VDMq59qAI6tOe"
+                "customer": "cus_7XTERXvcvYy1AM",
+                "subscription": "sub_7XTEl4bpPGHI5M"
             },
             "metadata": {
                 "id": "0000000000000000000186a8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-08.json b/spec/fixtures/sub-test-08.json
index 7b90cb777..98373b6b0 100644
--- a/spec/fixtures/sub-test-08.json
+++ b/spec/fixtures/sub-test-08.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMimrBc0mZ90",
+            "id": "cus_7XTELczMD5C0eb",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user107@me.com",
+            "email": "user7@me.com",
             "metadata": {
                 "id": "0000000000000000000186a9"
             },
@@ -24,49 +24,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMimrBc0mZ90",
+        "path": "/v1/customers/cus_7XTELczMD5C0eb/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDMimrBc0mZ90",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user107@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a9"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMimrBc0mZ90/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMdpg82cq4wP",
+            "id": "sub_7XTElwBfQMiEEZ",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365101,
-            "current_period_start": 1449686701,
-            "customer": "cus_7VDMimrBc0mZ90",
+            "current_period_end": 1452885435,
+            "current_period_start": 1450207035,
+            "customer": "cus_7XTELczMD5C0eb",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMimrBc0mZ90",
-                "subscription": "sub_7VDMdpg82cq4wP"
+                "customer": "cus_7XTELczMD5C0eb",
+                "subscription": "sub_7XTElwBfQMiEEZ"
             },
             "metadata": {
                 "id": "0000000000000000000186a9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -74,14 +52,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMimrBc0mZ90",
+        "path": "/v1/customers/cus_7XTELczMD5C0eb",
         "status": 200,
         "response": {
-            "id": "cus_7VDMimrBc0mZ90",
+            "id": "cus_7XTELczMD5C0eb",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user107@me.com",
+            "email": "user7@me.com",
             "metadata": {
                 "id": "0000000000000000000186a9"
             },
@@ -91,24 +69,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMdpg82cq4wP",
+                        "id": "sub_7XTElwBfQMiEEZ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365101,
-                        "current_period_start": 1449686701,
-                        "customer": "cus_7VDMimrBc0mZ90",
+                        "current_period_end": 1452885435,
+                        "current_period_start": 1450207035,
+                        "customer": "cus_7XTELczMD5C0eb",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMimrBc0mZ90",
-                            "subscription": "sub_7VDMdpg82cq4wP"
+                            "customer": "cus_7XTELczMD5C0eb",
+                            "subscription": "sub_7XTElwBfQMiEEZ"
                         },
                         "metadata": {
                             "id": "0000000000000000000186a9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -123,11 +101,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMALAaCBewXK",
+            "id": "cus_7XTE3JJWxXGJ6K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user108@me.com",
+            "email": "user8@me.com",
             "metadata": {
                 "id": "0000000000000000000186aa"
             },
@@ -138,51 +116,5 @@
                 "has_more": false
             }
         }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMimrBc0mZ90",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMimrBc0mZ90",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user107@me.com",
-            "metadata": {
-                "id": "0000000000000000000186a9"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMdpg82cq4wP",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365101,
-                        "current_period_start": 1449686701,
-                        "customer": "cus_7VDMimrBc0mZ90",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMimrBc0mZ90",
-                            "subscription": "sub_7VDMdpg82cq4wP"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186a9"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
     }
 ]
\ No newline at end of file
diff --git a/spec/fixtures/sub-test-09.json b/spec/fixtures/sub-test-09.json
index 7eb96cb71..58fee2ff8 100644
--- a/spec/fixtures/sub-test-09.json
+++ b/spec/fixtures/sub-test-09.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMFarU7W8Gmy",
+            "id": "cus_7XTExmK88Dutt4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user109@me.com",
+            "email": "user9@me.com",
             "metadata": {
                 "id": "0000000000000000000186ab"
             },
@@ -24,27 +24,49 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMFarU7W8Gmy/subscriptions",
+        "path": "/v1/customers/cus_7XTExmK88Dutt4",
         "status": 200,
         "response": {
-            "id": "sub_7VDMw3MAJ41tta",
+            "id": "cus_7XTExmK88Dutt4",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user9@me.com",
+            "metadata": {
+                "id": "0000000000000000000186ab"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTExmK88Dutt4/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTEVMbnveqHVp",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365105,
-            "current_period_start": 1449686705,
-            "customer": "cus_7VDMFarU7W8Gmy",
+            "current_period_end": 1452885437,
+            "current_period_start": 1450207037,
+            "customer": "cus_7XTExmK88Dutt4",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMFarU7W8Gmy",
-                "subscription": "sub_7VDMw3MAJ41tta"
+                "customer": "cus_7XTExmK88Dutt4",
+                "subscription": "sub_7XTEVMbnveqHVp"
             },
             "metadata": {
                 "id": "0000000000000000000186ab"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -55,11 +77,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMJCH5sXus78",
+            "id": "cus_7XTEb6w93HV0bK",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user110@me.com",
+            "email": "user10@me.com",
             "metadata": {
                 "id": "0000000000000000000186ac"
             },
@@ -74,14 +96,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMFarU7W8Gmy",
+        "path": "/v1/customers/cus_7XTExmK88Dutt4",
         "status": 200,
         "response": {
-            "id": "cus_7VDMFarU7W8Gmy",
+            "id": "cus_7XTExmK88Dutt4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user109@me.com",
+            "email": "user9@me.com",
             "metadata": {
                 "id": "0000000000000000000186ab"
             },
@@ -91,24 +113,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMw3MAJ41tta",
+                        "id": "sub_7XTEVMbnveqHVp",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365105,
-                        "current_period_start": 1449686705,
-                        "customer": "cus_7VDMFarU7W8Gmy",
+                        "current_period_end": 1452885437,
+                        "current_period_start": 1450207037,
+                        "customer": "cus_7XTExmK88Dutt4",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMFarU7W8Gmy",
-                            "subscription": "sub_7VDMw3MAJ41tta"
+                            "customer": "cus_7XTExmK88Dutt4",
+                            "subscription": "sub_7XTEVMbnveqHVp"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ab"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -120,14 +142,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMFarU7W8Gmy",
+        "path": "/v1/customers/cus_7XTExmK88Dutt4",
         "status": 200,
         "response": {
-            "id": "cus_7VDMFarU7W8Gmy",
+            "id": "cus_7XTExmK88Dutt4",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user109@me.com",
+            "email": "user9@me.com",
             "metadata": {
                 "id": "0000000000000000000186ab"
             },
@@ -137,24 +159,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMw3MAJ41tta",
+                        "id": "sub_7XTEVMbnveqHVp",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365105,
-                        "current_period_start": 1449686705,
-                        "customer": "cus_7VDMFarU7W8Gmy",
+                        "current_period_end": 1452885437,
+                        "current_period_start": 1450207037,
+                        "customer": "cus_7XTExmK88Dutt4",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMFarU7W8Gmy",
-                            "subscription": "sub_7VDMw3MAJ41tta"
+                            "customer": "cus_7XTExmK88Dutt4",
+                            "subscription": "sub_7XTEVMbnveqHVp"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ab"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -166,73 +188,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMFarU7W8Gmy",
+        "path": "/v1/customers/cus_7XTEb6w93HV0bK/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDMFarU7W8Gmy",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user109@me.com",
-            "metadata": {
-                "id": "0000000000000000000186ab"
-            },
-            "sources": {
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMw3MAJ41tta",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365105,
-                        "current_period_start": 1449686705,
-                        "customer": "cus_7VDMFarU7W8Gmy",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMFarU7W8Gmy",
-                            "subscription": "sub_7VDMw3MAJ41tta"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ab"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMJCH5sXus78/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDMnCRwJSWFrg",
+            "id": "sub_7XTEFSdZwRz1tx",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365106,
-            "current_period_start": 1449686706,
-            "customer": "cus_7VDMJCH5sXus78",
+            "current_period_end": 1452885439,
+            "current_period_start": 1450207039,
+            "customer": "cus_7XTEb6w93HV0bK",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMJCH5sXus78",
-                "subscription": "sub_7VDMnCRwJSWFrg"
+                "customer": "cus_7XTEb6w93HV0bK",
+                "subscription": "sub_7XTEFSdZwRz1tx"
             },
             "metadata": {
                 "id": "0000000000000000000186ac"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-10.json b/spec/fixtures/sub-test-10.json
index dac8db8fb..7fcdc3598 100644
--- a/spec/fixtures/sub-test-10.json
+++ b/spec/fixtures/sub-test-10.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMJaKYQsFp2d",
+            "id": "cus_7XTFh5awQT3w6y",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user111@me.com",
+            "email": "user11@me.com",
             "metadata": {
                 "id": "0000000000000000000186ad"
             },
@@ -24,27 +24,49 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMJaKYQsFp2d/subscriptions",
+        "path": "/v1/customers/cus_7XTFh5awQT3w6y",
         "status": 200,
         "response": {
-            "id": "sub_7VDMFO6EovmOwR",
+            "id": "cus_7XTFh5awQT3w6y",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user11@me.com",
+            "metadata": {
+                "id": "0000000000000000000186ad"
+            },
+            "sources": {
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFh5awQT3w6y/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTFud1h8PNwi1",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365109,
-            "current_period_start": 1449686709,
-            "customer": "cus_7VDMJaKYQsFp2d",
+            "current_period_end": 1452885441,
+            "current_period_start": 1450207041,
+            "customer": "cus_7XTFh5awQT3w6y",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMJaKYQsFp2d",
-                "subscription": "sub_7VDMFO6EovmOwR"
+                "customer": "cus_7XTFh5awQT3w6y",
+                "subscription": "sub_7XTFud1h8PNwi1"
             },
             "metadata": {
                 "id": "0000000000000000000186ad"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-11.json b/spec/fixtures/sub-test-11.json
index 09692ef95..d90f6eff9 100644
--- a/spec/fixtures/sub-test-11.json
+++ b/spec/fixtures/sub-test-11.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4y30udBZ6y",
+            "id": "cus_7XTFvcXwBcViLz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user112@me.com",
+            "email": "user12@me.com",
             "metadata": {
                 "id": "0000000000000000000186ae"
             },
diff --git a/spec/fixtures/sub-test-12.json b/spec/fixtures/sub-test-12.json
index d9afaa36f..b6e9f8a6a 100644
--- a/spec/fixtures/sub-test-12.json
+++ b/spec/fixtures/sub-test-12.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMGD6KRcGwXR",
+            "id": "cus_7XTFWmiA0hMYfl",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user113@me.com",
+            "email": "user13@me.com",
             "metadata": {
                 "id": "0000000000000000000186af"
             },
diff --git a/spec/fixtures/sub-test-13.json b/spec/fixtures/sub-test-13.json
index 928be0505..e522725ce 100644
--- a/spec/fixtures/sub-test-13.json
+++ b/spec/fixtures/sub-test-13.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCw8KaReE7xLUdthO4orSb",
+            "id": "tok_17IOIZKaReE7xLUdUHqOOaXb",
             "card": {
-                "id": "card_17GCw8KaReE7xLUdOPWS15Bv"
+                "id": "card_17IOIZKaReE7xLUdD1t4wGY8"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDMmrioYAeVKO",
+            "id": "cus_7XTFrcuV3ULBEE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user115@me.com",
+            "email": "user15@me.com",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDMmrioYAeVKO",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user115@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b1"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO/subscriptions",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +52,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO/subscriptions",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE",
         "status": 200,
         "response": {
-            "id": "sub_7VDM9eY05oeOyv",
+            "id": "cus_7XTFrcuV3ULBEE",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user15@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b1"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTFa54kxw7ZZT",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365114,
-            "current_period_start": 1449686714,
-            "customer": "cus_7VDMmrioYAeVKO",
+            "current_period_end": 1452885445,
+            "current_period_start": 1450207045,
+            "customer": "cus_7XTFrcuV3ULBEE",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMmrioYAeVKO",
-                "subscription": "sub_7VDM9eY05oeOyv"
+                "customer": "cus_7XTFrcuV3ULBEE",
+                "subscription": "sub_7XTFa54kxw7ZZT"
             },
             "metadata": {
                 "id": "0000000000000000000186b0"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE",
         "status": 200,
         "response": {
-            "id": "cus_7VDMmrioYAeVKO",
+            "id": "cus_7XTFrcuV3ULBEE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user115@me.com",
+            "email": "user15@me.com",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDM9eY05oeOyv",
+                        "id": "sub_7XTFa54kxw7ZZT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365114,
-                        "current_period_start": 1449686714,
-                        "customer": "cus_7VDMmrioYAeVKO",
+                        "current_period_end": 1452885445,
+                        "current_period_start": 1450207045,
+                        "customer": "cus_7XTFrcuV3ULBEE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMmrioYAeVKO",
-                            "subscription": "sub_7VDM9eY05oeOyv"
+                            "customer": "cus_7XTFrcuV3ULBEE",
+                            "subscription": "sub_7XTFa54kxw7ZZT"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO/subscriptions",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDMu0KhU3xUUv",
+            "id": "sub_7XTFNkTmzthaqw",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365116,
-            "current_period_start": 1449686716,
-            "customer": "cus_7VDMmrioYAeVKO",
+            "current_period_end": 1452885447,
+            "current_period_start": 1450207047,
+            "customer": "cus_7XTFrcuV3ULBEE",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
@@ -175,7 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwCKaReE7xLUdrx4hkf0a",
-                    "customer": "cus_7VDMmrioYAeVKO",
+                    "id": "in_17IOIdKaReE7xLUdXmleakxg",
+                    "customer": "cus_7XTFrcuV3ULBEE",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDMu0KhU3xUUv",
-                                "amount": 999,
+                                "id": "sub_7XTFNkTmzthaqw",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b1"
                                 },
@@ -201,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDMu0KhU3xUUv",
-                    "total": 999
+                    "subscription": "sub_7XTFNkTmzthaqw",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCwAKaReE7xLUdx4nsrGJo",
-                    "customer": "cus_7VDMmrioYAeVKO",
+                    "id": "in_17IOIbKaReE7xLUdvgTqdG9k",
+                    "customer": "cus_7XTFrcuV3ULBEE",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDMmrioYAeVKO",
-                        "subscription": "sub_7VDM9eY05oeOyv"
+                        "customer": "cus_7XTFrcuV3ULBEE",
+                        "subscription": "sub_7XTFa54kxw7ZZT"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDM9eY05oeOyv",
-                                "amount": 999,
+                                "id": "sub_7XTFa54kxw7ZZT",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b0"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDM9eY05oeOyv",
+                    "subscription": "sub_7XTFa54kxw7ZZT",
                     "total": 0
                 }
             ],
@@ -251,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE",
         "status": 200,
         "response": {
-            "id": "cus_7VDMmrioYAeVKO",
+            "id": "cus_7XTFrcuV3ULBEE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user115@me.com",
+            "email": "user15@me.com",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
                     }
                 ],
                 "has_more": false
@@ -274,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMu0KhU3xUUv",
+                        "id": "sub_7XTFNkTmzthaqw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365116,
-                        "current_period_start": 1449686716,
-                        "customer": "cus_7VDMmrioYAeVKO",
+                        "current_period_end": 1452885447,
+                        "current_period_start": 1450207047,
+                        "customer": "cus_7XTFrcuV3ULBEE",
                         "metadata": {
                             "id": "0000000000000000000186b1"
                         },
@@ -286,27 +286,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDM9eY05oeOyv",
+                        "id": "sub_7XTFa54kxw7ZZT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365114,
-                        "current_period_start": 1449686714,
-                        "customer": "cus_7VDMmrioYAeVKO",
+                        "current_period_end": 1452885445,
+                        "current_period_start": 1450207045,
+                        "customer": "cus_7XTFrcuV3ULBEE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMmrioYAeVKO",
-                            "subscription": "sub_7VDM9eY05oeOyv"
+                            "customer": "cus_7XTFrcuV3ULBEE",
+                            "subscription": "sub_7XTFa54kxw7ZZT"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTFrcuV3ULBEE",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user15@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b1"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFNkTmzthaqw",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885447,
+                        "current_period_start": 1450207047,
+                        "customer": "cus_7XTFrcuV3ULBEE",
+                        "metadata": {
+                            "id": "0000000000000000000186b1"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTFa54kxw7ZZT",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885445,
+                        "current_period_start": 1450207045,
+                        "customer": "cus_7XTFrcuV3ULBEE",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFrcuV3ULBEE",
+                            "subscription": "sub_7XTFa54kxw7ZZT"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b0"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwCKaReE7xLUdrx4hkf0a",
+        "path": "/v1/invoices/in_17IOIdKaReE7xLUdXmleakxg",
         "status": 200,
         "response": {
-            "id": "in_17GCwCKaReE7xLUdrx4hkf0a",
-            "customer": "cus_7VDMmrioYAeVKO",
+            "id": "in_17IOIdKaReE7xLUdXmleakxg",
+            "customer": "cus_7XTFrcuV3ULBEE",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDMu0KhU3xUUv",
-                        "amount": 999,
+                        "id": "sub_7XTFNkTmzthaqw",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b1"
                         },
@@ -336,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDMu0KhU3xUUv",
-            "total": 999
+            "subscription": "sub_7XTFNkTmzthaqw",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE",
         "status": 200,
         "response": {
-            "id": "cus_7VDMmrioYAeVKO",
+            "id": "cus_7XTFrcuV3ULBEE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user115@me.com",
+            "email": "user15@me.com",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
+                        "id": "card_17IOIZKaReE7xLUdD1t4wGY8",
+                        "customer": "cus_7XTFrcuV3ULBEE"
                     }
                 ],
                 "has_more": false
@@ -373,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDMu0KhU3xUUv",
+                        "id": "sub_7XTFNkTmzthaqw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365116,
-                        "current_period_start": 1449686716,
-                        "customer": "cus_7VDMmrioYAeVKO",
+                        "current_period_end": 1452885447,
+                        "current_period_start": 1450207047,
+                        "customer": "cus_7XTFrcuV3ULBEE",
                         "metadata": {
                             "id": "0000000000000000000186b1"
                         },
@@ -385,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDM9eY05oeOyv",
+                        "id": "sub_7XTFa54kxw7ZZT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365114,
-                        "current_period_start": 1449686714,
-                        "customer": "cus_7VDMmrioYAeVKO",
+                        "current_period_end": 1452885445,
+                        "current_period_start": 1450207045,
+                        "customer": "cus_7XTFrcuV3ULBEE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDMmrioYAeVKO",
-                            "subscription": "sub_7VDM9eY05oeOyv"
+                            "customer": "cus_7XTFrcuV3ULBEE",
+                            "subscription": "sub_7XTFa54kxw7ZZT"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,96 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO",
+        "path": "/v1/invoices/in_17IOIbKaReE7xLUdvgTqdG9k",
         "status": 200,
         "response": {
-            "id": "cus_7VDMmrioYAeVKO",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user115@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b1"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCw8KaReE7xLUdOPWS15Bv",
-                        "customer": "cus_7VDMmrioYAeVKO"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDMu0KhU3xUUv",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365116,
-                        "current_period_start": 1449686716,
-                        "customer": "cus_7VDMmrioYAeVKO",
-                        "metadata": {
-                            "id": "0000000000000000000186b1"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDM9eY05oeOyv",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365114,
-                        "current_period_start": 1449686714,
-                        "customer": "cus_7VDMmrioYAeVKO",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDMmrioYAeVKO",
-                            "subscription": "sub_7VDM9eY05oeOyv"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b0"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCwAKaReE7xLUdx4nsrGJo",
-        "status": 200,
-        "response": {
-            "id": "in_17GCwAKaReE7xLUdx4nsrGJo",
-            "customer": "cus_7VDMmrioYAeVKO",
+            "id": "in_17IOIbKaReE7xLUdvgTqdG9k",
+            "customer": "cus_7XTFrcuV3ULBEE",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMmrioYAeVKO",
-                "subscription": "sub_7VDM9eY05oeOyv"
+                "customer": "cus_7XTFrcuV3ULBEE",
+                "subscription": "sub_7XTFa54kxw7ZZT"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDM9eY05oeOyv",
-                        "amount": 999,
+                        "id": "sub_7XTFa54kxw7ZZT",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,21 +516,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDM9eY05oeOyv",
+            "subscription": "sub_7XTFa54kxw7ZZT",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO/subscriptions/sub_7VDMu0KhU3xUUv",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE/subscriptions/sub_7XTFNkTmzthaqw",
         "status": 200,
         "response": {
-            "id": "sub_7VDMu0KhU3xUUv",
+            "id": "sub_7XTFNkTmzthaqw",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365116,
-            "current_period_start": 1449686716,
-            "customer": "cus_7VDMmrioYAeVKO",
+            "current_period_end": 1452885447,
+            "current_period_start": 1450207047,
+            "customer": "cus_7XTFrcuV3ULBEE",
             "metadata": {
                 "id": "0000000000000000000186b1"
             },
@@ -538,33 +538,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDMmrioYAeVKO/subscriptions/sub_7VDM9eY05oeOyv",
+        "path": "/v1/customers/cus_7XTFrcuV3ULBEE/subscriptions/sub_7XTFa54kxw7ZZT",
         "status": 200,
         "response": {
-            "id": "sub_7VDM9eY05oeOyv",
+            "id": "sub_7XTFa54kxw7ZZT",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365114,
-            "current_period_start": 1449686714,
-            "customer": "cus_7VDMmrioYAeVKO",
+            "current_period_end": 1452885445,
+            "current_period_start": 1450207045,
+            "customer": "cus_7XTFrcuV3ULBEE",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDMmrioYAeVKO",
-                "subscription": "sub_7VDM9eY05oeOyv"
+                "customer": "cus_7XTFrcuV3ULBEE",
+                "subscription": "sub_7XTFa54kxw7ZZT"
             },
             "metadata": {
                 "id": "0000000000000000000186b0"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-14.json b/spec/fixtures/sub-test-14.json
index 8bc2f444f..75f3369b8 100644
--- a/spec/fixtures/sub-test-14.json
+++ b/spec/fixtures/sub-test-14.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCwFKaReE7xLUdWI6KM2oH",
+            "id": "tok_17IOIiKaReE7xLUd4PuW6VzA",
             "card": {
-                "id": "card_17GCwFKaReE7xLUdKzBLn7i7"
+                "id": "card_17IOIiKaReE7xLUdk6spMSgz"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
+            "id": "cus_7XTFhgQd3FLWZt",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user117@me.com",
+            "email": "user17@me.com",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDM4cabFTvRKN",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user117@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b3"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +52,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
         "status": 200,
         "response": {
-            "id": "sub_7VDNm23D4Adhbm",
+            "id": "cus_7XTFhgQd3FLWZt",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user17@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b3"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTFDi99MUnBlc",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365121,
-            "current_period_start": 1449686721,
-            "customer": "cus_7VDM4cabFTvRKN",
+            "current_period_end": 1452885454,
+            "current_period_start": 1450207054,
+            "customer": "cus_7XTFhgQd3FLWZt",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM4cabFTvRKN",
-                "subscription": "sub_7VDNm23D4Adhbm"
+                "customer": "cus_7XTFhgQd3FLWZt",
+                "subscription": "sub_7XTFDi99MUnBlc"
             },
             "metadata": {
                 "id": "0000000000000000000186b2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
+            "id": "cus_7XTFhgQd3FLWZt",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user117@me.com",
+            "email": "user17@me.com",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNm23D4Adhbm",
+                        "id": "sub_7XTFDi99MUnBlc",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365121,
-                        "current_period_start": 1449686721,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885454,
+                        "current_period_start": 1450207054,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDM4cabFTvRKN",
-                            "subscription": "sub_7VDNm23D4Adhbm"
+                            "customer": "cus_7XTFhgQd3FLWZt",
+                            "subscription": "sub_7XTFDi99MUnBlc"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNwy2CROZ8Th",
+            "id": "sub_7XTFDoYpPLLuIT",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365122,
-            "current_period_start": 1449686722,
-            "customer": "cus_7VDM4cabFTvRKN",
+            "current_period_end": 1452885456,
+            "current_period_start": 1450207056,
+            "customer": "cus_7XTFhgQd3FLWZt",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
@@ -175,7 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwIKaReE7xLUdvxGcczE4",
-                    "customer": "cus_7VDM4cabFTvRKN",
+                    "id": "in_17IOImKaReE7xLUdKePuFyPD",
+                    "customer": "cus_7XTFhgQd3FLWZt",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNwy2CROZ8Th",
-                                "amount": 999,
+                                "id": "sub_7XTFDoYpPLLuIT",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b3"
                                 },
@@ -201,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNwy2CROZ8Th",
-                    "total": 999
+                    "subscription": "sub_7XTFDoYpPLLuIT",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCwHKaReE7xLUd4Ju1asAT",
-                    "customer": "cus_7VDM4cabFTvRKN",
+                    "id": "in_17IOIkKaReE7xLUdtWwwSJXr",
+                    "customer": "cus_7XTFhgQd3FLWZt",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDM4cabFTvRKN",
-                        "subscription": "sub_7VDNm23D4Adhbm"
+                        "customer": "cus_7XTFhgQd3FLWZt",
+                        "subscription": "sub_7XTFDi99MUnBlc"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNm23D4Adhbm",
-                                "amount": 999,
+                                "id": "sub_7XTFDi99MUnBlc",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b2"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNm23D4Adhbm",
+                    "subscription": "sub_7XTFDi99MUnBlc",
                     "total": 0
                 }
             ],
@@ -251,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
+            "id": "cus_7XTFhgQd3FLWZt",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user117@me.com",
+            "email": "user17@me.com",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
                     }
                 ],
                 "has_more": false
@@ -274,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNwy2CROZ8Th",
+                        "id": "sub_7XTFDoYpPLLuIT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365122,
-                        "current_period_start": 1449686722,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885456,
+                        "current_period_start": 1450207056,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "metadata": {
                             "id": "0000000000000000000186b3"
                         },
@@ -286,27 +286,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNm23D4Adhbm",
+                        "id": "sub_7XTFDi99MUnBlc",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365121,
-                        "current_period_start": 1449686721,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885454,
+                        "current_period_start": 1450207054,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDM4cabFTvRKN",
-                            "subscription": "sub_7VDNm23D4Adhbm"
+                            "customer": "cus_7XTFhgQd3FLWZt",
+                            "subscription": "sub_7XTFDi99MUnBlc"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTFhgQd3FLWZt",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user17@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b3"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFDoYpPLLuIT",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885456,
+                        "current_period_start": 1450207056,
+                        "customer": "cus_7XTFhgQd3FLWZt",
+                        "metadata": {
+                            "id": "0000000000000000000186b3"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTFDi99MUnBlc",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885454,
+                        "current_period_start": 1450207054,
+                        "customer": "cus_7XTFhgQd3FLWZt",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFhgQd3FLWZt",
+                            "subscription": "sub_7XTFDi99MUnBlc"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b2"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwIKaReE7xLUdvxGcczE4",
+        "path": "/v1/invoices/in_17IOImKaReE7xLUdKePuFyPD",
         "status": 200,
         "response": {
-            "id": "in_17GCwIKaReE7xLUdvxGcczE4",
-            "customer": "cus_7VDM4cabFTvRKN",
+            "id": "in_17IOImKaReE7xLUdKePuFyPD",
+            "customer": "cus_7XTFhgQd3FLWZt",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNwy2CROZ8Th",
-                        "amount": 999,
+                        "id": "sub_7XTFDoYpPLLuIT",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b3"
                         },
@@ -336,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNwy2CROZ8Th",
-            "total": 999
+            "subscription": "sub_7XTFDoYpPLLuIT",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
+            "id": "cus_7XTFhgQd3FLWZt",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user117@me.com",
+            "email": "user17@me.com",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
                     }
                 ],
                 "has_more": false
@@ -373,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNwy2CROZ8Th",
+                        "id": "sub_7XTFDoYpPLLuIT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365122,
-                        "current_period_start": 1449686722,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885456,
+                        "current_period_start": 1450207056,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "metadata": {
                             "id": "0000000000000000000186b3"
                         },
@@ -385,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNm23D4Adhbm",
+                        "id": "sub_7XTFDi99MUnBlc",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365121,
-                        "current_period_start": 1449686721,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885454,
+                        "current_period_start": 1450207054,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDM4cabFTvRKN",
-                            "subscription": "sub_7VDNm23D4Adhbm"
+                            "customer": "cus_7XTFhgQd3FLWZt",
+                            "subscription": "sub_7XTFDi99MUnBlc"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,96 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
+        "path": "/v1/invoices/in_17IOIkKaReE7xLUdtWwwSJXr",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user117@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b3"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNwy2CROZ8Th",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365122,
-                        "current_period_start": 1449686722,
-                        "customer": "cus_7VDM4cabFTvRKN",
-                        "metadata": {
-                            "id": "0000000000000000000186b3"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDNm23D4Adhbm",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365121,
-                        "current_period_start": 1449686721,
-                        "customer": "cus_7VDM4cabFTvRKN",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDM4cabFTvRKN",
-                            "subscription": "sub_7VDNm23D4Adhbm"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b2"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCwHKaReE7xLUd4Ju1asAT",
-        "status": 200,
-        "response": {
-            "id": "in_17GCwHKaReE7xLUd4Ju1asAT",
-            "customer": "cus_7VDM4cabFTvRKN",
+            "id": "in_17IOIkKaReE7xLUdtWwwSJXr",
+            "customer": "cus_7XTFhgQd3FLWZt",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM4cabFTvRKN",
-                "subscription": "sub_7VDNm23D4Adhbm"
+                "customer": "cus_7XTFhgQd3FLWZt",
+                "subscription": "sub_7XTFDi99MUnBlc"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNm23D4Adhbm",
-                        "amount": 999,
+                        "id": "sub_7XTFDi99MUnBlc",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,34 +516,34 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNm23D4Adhbm",
+            "subscription": "sub_7XTFDi99MUnBlc",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions/sub_7VDNm23D4Adhbm",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions/sub_7XTFDi99MUnBlc",
         "status": 200,
         "response": {
-            "id": "sub_7VDNm23D4Adhbm",
+            "id": "sub_7XTFDi99MUnBlc",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365121,
-            "current_period_start": 1449686721,
-            "customer": "cus_7VDM4cabFTvRKN",
+            "current_period_end": 1452885454,
+            "current_period_start": 1450207054,
+            "customer": "cus_7XTFhgQd3FLWZt",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDM4cabFTvRKN",
-                "subscription": "sub_7VDNm23D4Adhbm"
+                "customer": "cus_7XTFhgQd3FLWZt",
+                "subscription": "sub_7XTFDi99MUnBlc"
             },
             "metadata": {
                 "id": "0000000000000000000186b2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -551,14 +551,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions/sub_7VDNwy2CROZ8Th",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions/sub_7XTFDoYpPLLuIT",
         "status": 200,
         "response": {
-            "id": "sub_7VDNwy2CROZ8Th",
+            "id": "sub_7XTFDoYpPLLuIT",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365122,
-            "current_period_start": 1449686722,
-            "customer": "cus_7VDM4cabFTvRKN",
+            "current_period_end": 1452885456,
+            "current_period_start": 1450207056,
+            "customer": "cus_7XTFhgQd3FLWZt",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
@@ -572,7 +572,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions/sub_7VDNm23D4Adhbm",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions/sub_7XTFDi99MUnBlc",
         "status": 404,
         "response": {
             "error": {
@@ -583,22 +583,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt",
         "status": 200,
         "response": {
-            "id": "cus_7VDM4cabFTvRKN",
+            "id": "cus_7XTFhgQd3FLWZt",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user117@me.com",
+            "email": "user17@me.com",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwFKaReE7xLUdKzBLn7i7",
-                        "customer": "cus_7VDM4cabFTvRKN"
+                        "id": "card_17IOIiKaReE7xLUdk6spMSgz",
+                        "customer": "cus_7XTFhgQd3FLWZt"
                     }
                 ],
                 "has_more": false
@@ -606,11 +606,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNwy2CROZ8Th",
+                        "id": "sub_7XTFDoYpPLLuIT",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365122,
-                        "current_period_start": 1449686722,
-                        "customer": "cus_7VDM4cabFTvRKN",
+                        "current_period_end": 1452885456,
+                        "current_period_start": 1450207056,
+                        "customer": "cus_7XTFhgQd3FLWZt",
                         "metadata": {
                             "id": "0000000000000000000186b3"
                         },
@@ -628,14 +628,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDM4cabFTvRKN/subscriptions/sub_7VDNwy2CROZ8Th",
+        "path": "/v1/customers/cus_7XTFhgQd3FLWZt/subscriptions/sub_7XTFDoYpPLLuIT",
         "status": 200,
         "response": {
-            "id": "sub_7VDNwy2CROZ8Th",
+            "id": "sub_7XTFDoYpPLLuIT",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365122,
-            "current_period_start": 1449686722,
-            "customer": "cus_7VDM4cabFTvRKN",
+            "current_period_end": 1452885456,
+            "current_period_start": 1450207056,
+            "customer": "cus_7XTFhgQd3FLWZt",
             "metadata": {
                 "id": "0000000000000000000186b3"
             },
diff --git a/spec/fixtures/sub-test-15.json b/spec/fixtures/sub-test-15.json
index 08360efe7..00d09b96c 100644
--- a/spec/fixtures/sub-test-15.json
+++ b/spec/fixtures/sub-test-15.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCwOKaReE7xLUdUD4Nkjd7",
+            "id": "tok_17IOIsKaReE7xLUdw8Rb1XdZ",
             "card": {
-                "id": "card_17GCwOKaReE7xLUd3yZTswdV"
+                "id": "card_17IOIsKaReE7xLUdYhpmFM59"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNPD9TIPgfsG",
+            "id": "sub_7XTFgIPGIMmSFB",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365130,
-            "current_period_start": 1449686730,
-            "customer": "cus_7VDN2KNqruyD9I",
+            "current_period_end": 1452885464,
+            "current_period_start": 1450207064,
+            "customer": "cus_7XTFwMAehprqkF",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -92,22 +92,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -115,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -137,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -160,62 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDN2KNqruyD9I",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user119@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b5"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNPD9TIPgfsG",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
-                        "metadata": {
-                            "id": "0000000000000000000186b5"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -227,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDNPD9TIPgfsG",
+                    "id": "sub_7XTFgIPGIMmSFB",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365130,
-                    "current_period_start": 1449686730,
-                    "customer": "cus_7VDN2KNqruyD9I",
+                    "current_period_end": 1452885464,
+                    "current_period_start": 1450207064,
+                    "customer": "cus_7XTFwMAehprqkF",
                     "metadata": {
                         "id": "0000000000000000000186b5"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -253,27 +208,72 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "sub_7VDNwjyGqYhYMg",
+            "id": "cus_7XTFwMAehprqkF",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user19@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b5"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFgIPGIMmSFB",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
+                        "metadata": {
+                            "id": "0000000000000000000186b5"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTFag72pVDX5H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365133,
-            "current_period_start": 1449686733,
-            "customer": "cus_7VDN2KNqruyD9I",
+            "current_period_end": 1452885466,
+            "current_period_start": 1450207066,
+            "customer": "cus_7XTFwMAehprqkF",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDN2KNqruyD9I",
-                "subscription": "sub_7VDNwjyGqYhYMg"
+                "customer": "cus_7XTFwMAehprqkF",
+                "subscription": "sub_7XTFag72pVDX5H"
             },
             "metadata": {
                 "id": "0000000000000000000186b4"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -281,14 +281,81 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "sub_7VDNirCm8gp2m7",
+            "id": "cus_7XTFwMAehprqkF",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user19@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b5"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFag72pVDX5H",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885466,
+                        "current_period_start": 1450207066,
+                        "customer": "cus_7XTFwMAehprqkF",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFwMAehprqkF",
+                            "subscription": "sub_7XTFag72pVDX5H"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b4"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTFgIPGIMmSFB",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
+                        "metadata": {
+                            "id": "0000000000000000000186b5"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTF2yEjKah2dN",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365135,
-            "current_period_start": 1449686735,
-            "customer": "cus_7VDN2KNqruyD9I",
+            "current_period_end": 1452885468,
+            "current_period_start": 1450207068,
+            "customer": "cus_7XTFwMAehprqkF",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
@@ -296,7 +363,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
@@ -307,13 +374,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwVKaReE7xLUdNP0m26Nw",
-                    "customer": "cus_7VDN2KNqruyD9I",
+                    "id": "in_17IOIyKaReE7xLUdxFT29YiX",
+                    "customer": "cus_7XTFwMAehprqkF",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNirCm8gp2m7",
-                                "amount": 799,
+                                "id": "sub_7XTF2yEjKah2dN",
+                                "amount": 80,
                                 "metadata": {
                                     "id": "0000000000000000000186b5"
                                 },
@@ -322,37 +389,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 799,
+                                "quantity": 80,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNirCm8gp2m7",
-                    "total": 799
+                    "subscription": "sub_7XTF2yEjKah2dN",
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCwTKaReE7xLUdM7EWTJ09",
-                    "customer": "cus_7VDN2KNqruyD9I",
+                    "id": "in_17IOIwKaReE7xLUds6cE7Sf7",
+                    "customer": "cus_7XTFwMAehprqkF",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDN2KNqruyD9I",
-                        "subscription": "sub_7VDNwjyGqYhYMg"
+                        "customer": "cus_7XTFwMAehprqkF",
+                        "subscription": "sub_7XTFag72pVDX5H"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNwjyGqYhYMg",
-                                "amount": 999,
+                                "id": "sub_7XTFag72pVDX5H",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b4"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -362,23 +429,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNwjyGqYhYMg",
+                    "subscription": "sub_7XTFag72pVDX5H",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCwQKaReE7xLUdqSluEgSu",
-                    "customer": "cus_7VDN2KNqruyD9I",
+                    "id": "in_17IOIuKaReE7xLUdocqcr5Qi",
+                    "customer": "cus_7XTFwMAehprqkF",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNPD9TIPgfsG",
-                                "amount": 999,
+                                "id": "sub_7XTFgIPGIMmSFB",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b5"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -388,8 +455,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNPD9TIPgfsG",
-                    "total": 999
+                    "subscription": "sub_7XTFgIPGIMmSFB",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -398,22 +465,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -421,11 +488,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNirCm8gp2m7",
+                        "id": "sub_7XTF2yEjKah2dN",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365135,
-                        "current_period_start": 1449686735,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885468,
+                        "current_period_start": 1450207068,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
@@ -433,42 +500,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNwjyGqYhYMg",
+                        "id": "sub_7XTFag72pVDX5H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365133,
-                        "current_period_start": 1449686733,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885466,
+                        "current_period_start": 1450207066,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDN2KNqruyD9I",
-                            "subscription": "sub_7VDNwjyGqYhYMg"
+                            "customer": "cus_7XTFwMAehprqkF",
+                            "subscription": "sub_7XTFag72pVDX5H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -480,22 +547,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -503,11 +570,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNirCm8gp2m7",
+                        "id": "sub_7XTF2yEjKah2dN",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365135,
-                        "current_period_start": 1449686735,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885468,
+                        "current_period_start": 1450207068,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
@@ -515,124 +582,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNwjyGqYhYMg",
+                        "id": "sub_7XTFag72pVDX5H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365133,
-                        "current_period_start": 1449686733,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885466,
+                        "current_period_start": 1450207066,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDN2KNqruyD9I",
-                            "subscription": "sub_7VDNwjyGqYhYMg"
+                            "customer": "cus_7XTFwMAehprqkF",
+                            "subscription": "sub_7XTFag72pVDX5H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDN2KNqruyD9I",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user119@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b5"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNirCm8gp2m7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365135,
-                        "current_period_start": 1449686735,
-                        "customer": "cus_7VDN2KNqruyD9I",
-                        "metadata": {
-                            "id": "0000000000000000000186b5"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 799
-                    },
-                    {
-                        "id": "sub_7VDNwjyGqYhYMg",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365133,
-                        "current_period_start": 1449686733,
-                        "customer": "cus_7VDN2KNqruyD9I",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDN2KNqruyD9I",
-                            "subscription": "sub_7VDNwjyGqYhYMg"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b4"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDNPD9TIPgfsG",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
-                        "metadata": {
-                            "id": "0000000000000000000186b5"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -644,16 +629,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwVKaReE7xLUdNP0m26Nw",
+        "path": "/v1/invoices/in_17IOIyKaReE7xLUdxFT29YiX",
         "status": 200,
         "response": {
-            "id": "in_17GCwVKaReE7xLUdNP0m26Nw",
-            "customer": "cus_7VDN2KNqruyD9I",
+            "id": "in_17IOIyKaReE7xLUdxFT29YiX",
+            "customer": "cus_7XTFwMAehprqkF",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNirCm8gp2m7",
-                        "amount": 799,
+                        "id": "sub_7XTF2yEjKah2dN",
+                        "amount": 80,
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
@@ -662,36 +647,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 799,
+                        "quantity": 80,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNirCm8gp2m7",
-            "total": 799
+            "subscription": "sub_7XTF2yEjKah2dN",
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -699,11 +684,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNirCm8gp2m7",
+                        "id": "sub_7XTF2yEjKah2dN",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365135,
-                        "current_period_start": 1449686735,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885468,
+                        "current_period_start": 1450207068,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
@@ -711,42 +696,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNwjyGqYhYMg",
+                        "id": "sub_7XTFag72pVDX5H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365133,
-                        "current_period_start": 1449686733,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885466,
+                        "current_period_start": 1450207066,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDN2KNqruyD9I",
-                            "subscription": "sub_7VDNwjyGqYhYMg"
+                            "customer": "cus_7XTFwMAehprqkF",
+                            "subscription": "sub_7XTFag72pVDX5H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -758,29 +743,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwTKaReE7xLUdM7EWTJ09",
+        "path": "/v1/invoices/in_17IOIwKaReE7xLUds6cE7Sf7",
         "status": 200,
         "response": {
-            "id": "in_17GCwTKaReE7xLUdM7EWTJ09",
-            "customer": "cus_7VDN2KNqruyD9I",
+            "id": "in_17IOIwKaReE7xLUds6cE7Sf7",
+            "customer": "cus_7XTFwMAehprqkF",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDN2KNqruyD9I",
-                "subscription": "sub_7VDNwjyGqYhYMg"
+                "customer": "cus_7XTFwMAehprqkF",
+                "subscription": "sub_7XTFag72pVDX5H"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNwjyGqYhYMg",
-                        "amount": 999,
+                        "id": "sub_7XTFag72pVDX5H",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -790,29 +775,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNwjyGqYhYMg",
+            "subscription": "sub_7XTFag72pVDX5H",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwQKaReE7xLUdqSluEgSu",
+        "path": "/v1/invoices/in_17IOIuKaReE7xLUdocqcr5Qi",
         "status": 200,
         "response": {
-            "id": "in_17GCwQKaReE7xLUdqSluEgSu",
-            "customer": "cus_7VDN2KNqruyD9I",
+            "id": "in_17IOIuKaReE7xLUdocqcr5Qi",
+            "customer": "cus_7XTFwMAehprqkF",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
-                        "amount": 999,
+                        "id": "sub_7XTFgIPGIMmSFB",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -822,21 +807,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNPD9TIPgfsG",
-            "total": 999
+            "subscription": "sub_7XTFgIPGIMmSFB",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions/sub_7VDNirCm8gp2m7",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions/sub_7XTF2yEjKah2dN",
         "status": 200,
         "response": {
-            "id": "sub_7VDNirCm8gp2m7",
+            "id": "sub_7XTF2yEjKah2dN",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365135,
-            "current_period_start": 1449686735,
-            "customer": "cus_7VDN2KNqruyD9I",
+            "current_period_end": 1452885468,
+            "current_period_start": 1450207068,
+            "customer": "cus_7XTFwMAehprqkF",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
@@ -844,28 +829,28 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF",
         "status": 200,
         "response": {
-            "id": "cus_7VDN2KNqruyD9I",
+            "id": "cus_7XTFwMAehprqkF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user119@me.com",
+            "email": "user19@me.com",
             "metadata": {
                 "id": "0000000000000000000186b5"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwOKaReE7xLUd3yZTswdV",
-                        "customer": "cus_7VDN2KNqruyD9I"
+                        "id": "card_17IOIsKaReE7xLUdYhpmFM59",
+                        "customer": "cus_7XTFwMAehprqkF"
                     }
                 ],
                 "has_more": false
@@ -873,11 +858,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNirCm8gp2m7",
+                        "id": "sub_7XTF2yEjKah2dN",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365135,
-                        "current_period_start": 1449686735,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885468,
+                        "current_period_start": 1450207068,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
@@ -885,42 +870,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNwjyGqYhYMg",
+                        "id": "sub_7XTFag72pVDX5H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365133,
-                        "current_period_start": 1449686733,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885466,
+                        "current_period_start": 1450207066,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDN2KNqruyD9I",
-                            "subscription": "sub_7VDNwjyGqYhYMg"
+                            "customer": "cus_7XTFwMAehprqkF",
+                            "subscription": "sub_7XTFag72pVDX5H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b4"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNPD9TIPgfsG",
+                        "id": "sub_7XTFgIPGIMmSFB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365130,
-                        "current_period_start": 1449686730,
-                        "customer": "cus_7VDN2KNqruyD9I",
+                        "current_period_end": 1452885464,
+                        "current_period_start": 1450207064,
+                        "customer": "cus_7XTFwMAehprqkF",
                         "metadata": {
                             "id": "0000000000000000000186b5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -932,27 +917,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDN2KNqruyD9I/subscriptions/sub_7VDNwjyGqYhYMg",
+        "path": "/v1/customers/cus_7XTFwMAehprqkF/subscriptions/sub_7XTFag72pVDX5H",
         "status": 200,
         "response": {
-            "id": "sub_7VDNwjyGqYhYMg",
+            "id": "sub_7XTFag72pVDX5H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365133,
-            "current_period_start": 1449686733,
-            "customer": "cus_7VDN2KNqruyD9I",
+            "current_period_end": 1452885466,
+            "current_period_start": 1450207066,
+            "customer": "cus_7XTFwMAehprqkF",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDN2KNqruyD9I",
-                "subscription": "sub_7VDNwjyGqYhYMg"
+                "customer": "cus_7XTFwMAehprqkF",
+                "subscription": "sub_7XTFag72pVDX5H"
             },
             "metadata": {
                 "id": "0000000000000000000186b4"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-16.json b/spec/fixtures/sub-test-16.json
index 4395309c2..cf579f617 100644
--- a/spec/fixtures/sub-test-16.json
+++ b/spec/fixtures/sub-test-16.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCwbKaReE7xLUdaT8CuSIS",
+            "id": "tok_17IOJ4KaReE7xLUdz914OJ2Z",
             "card": {
-                "id": "card_17GCwbKaReE7xLUd5IJIFWBp"
+                "id": "card_17IOJ4KaReE7xLUdcyI7BPAp"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -71,88 +71,43 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNR05m6WWAeS",
+            "id": "sub_7XTFcIzmo5v4FJ",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365143,
-            "current_period_start": 1449686743,
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "current_period_end": 1452885476,
+            "current_period_start": 1450207076,
+            "customer": "cus_7XTFw5oPfEF5mE",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user121@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNR05m6WWAeS",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "metadata": {
-                            "id": "0000000000000000000186b7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -160,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -205,17 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -227,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDNR05m6WWAeS",
+                    "id": "sub_7XTFcIzmo5v4FJ",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365143,
-                    "current_period_start": 1449686743,
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "current_period_end": 1452885476,
+                    "current_period_start": 1450207076,
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "metadata": {
                         "id": "0000000000000000000186b7"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -253,50 +208,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "sub_7VDNS5E09bpvSk",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365146,
-            "current_period_start": 1449686746,
-            "customer": "cus_7VDNPC9EZ6JGhE",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDNPC9EZ6JGhE",
-                "subscription": "sub_7VDNS5E09bpvSk"
-            },
-            "metadata": {
-                "id": "0000000000000000000186b6"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -304,39 +231,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNS5E09bpvSk",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365146,
-                        "current_period_start": 1449686746,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDNPC9EZ6JGhE",
-                            "subscription": "sub_7VDNS5E09bpvSk"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b6"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDNR05m6WWAeS",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -348,14 +253,42 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNHF276hw9Ic",
+            "id": "sub_7XTFw0E8QlBiDM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365147,
-            "current_period_start": 1449686747,
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "current_period_end": 1452885478,
+            "current_period_start": 1450207078,
+            "customer": "cus_7XTFw5oPfEF5mE",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTFw5oPfEF5mE",
+                "subscription": "sub_7XTFw0E8QlBiDM"
+            },
+            "metadata": {
+                "id": "0000000000000000000186b6"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTFyPwPpMod2T",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885479,
+            "current_period_start": 1450207079,
+            "customer": "cus_7XTFw5oPfEF5mE",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
@@ -363,7 +296,89 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTFw5oPfEF5mE",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user21@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b7"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFyPwPpMod2T",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTFw0E8QlBiDM",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b6"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTFcIzmo5v4FJ",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -374,13 +389,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwhKaReE7xLUdCY899Ga9",
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "id": "in_17IOJ9KaReE7xLUdg5emvAcs",
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNHF276hw9Ic",
-                                "amount": 799,
+                                "id": "sub_7XTFyPwPpMod2T",
+                                "amount": 80,
                                 "metadata": {
                                     "id": "0000000000000000000186b7"
                                 },
@@ -389,37 +404,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 799,
+                                "quantity": 80,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNHF276hw9Ic",
-                    "total": 799
+                    "subscription": "sub_7XTFyPwPpMod2T",
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCwgKaReE7xLUdQgRhKcNI",
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "id": "in_17IOJ8KaReE7xLUd4sINXxLJ",
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "subscription": "sub_7VDNS5E09bpvSk"
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "subscription": "sub_7XTFw0E8QlBiDM"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNS5E09bpvSk",
-                                "amount": 999,
+                                "id": "sub_7XTFw0E8QlBiDM",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b6"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -429,23 +444,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNS5E09bpvSk",
+                    "subscription": "sub_7XTFw0E8QlBiDM",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCwdKaReE7xLUdRLGvAqaG",
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "id": "in_17IOJ6KaReE7xLUdBE1OY0Lx",
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNR05m6WWAeS",
-                                "amount": 999,
+                                "id": "sub_7XTFcIzmo5v4FJ",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b7"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -455,8 +470,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNR05m6WWAeS",
-                    "total": 999
+                    "subscription": "sub_7XTFcIzmo5v4FJ",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -465,22 +480,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -488,11 +503,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNHF276hw9Ic",
+                        "id": "sub_7XTFyPwPpMod2T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365147,
-                        "current_period_start": 1449686747,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
@@ -500,42 +515,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNS5E09bpvSk",
+                        "id": "sub_7XTFw0E8QlBiDM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365146,
-                        "current_period_start": 1449686746,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNPC9EZ6JGhE",
-                            "subscription": "sub_7VDNS5E09bpvSk"
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -547,16 +562,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwhKaReE7xLUdCY899Ga9",
+        "path": "/v1/invoices/in_17IOJ9KaReE7xLUdg5emvAcs",
         "status": 200,
         "response": {
-            "id": "in_17GCwhKaReE7xLUdCY899Ga9",
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "id": "in_17IOJ9KaReE7xLUdg5emvAcs",
+            "customer": "cus_7XTFw5oPfEF5mE",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNHF276hw9Ic",
-                        "amount": 799,
+                        "id": "sub_7XTFyPwPpMod2T",
+                        "amount": 80,
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
@@ -565,118 +580,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 799,
+                        "quantity": 80,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNHF276hw9Ic",
-            "total": 799
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user121@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNHF276hw9Ic",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365147,
-                        "current_period_start": 1449686747,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "metadata": {
-                            "id": "0000000000000000000186b7"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 799
-                    },
-                    {
-                        "id": "sub_7VDNS5E09bpvSk",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365146,
-                        "current_period_start": 1449686746,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDNPC9EZ6JGhE",
-                            "subscription": "sub_7VDNS5E09bpvSk"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b6"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDNR05m6WWAeS",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
-                        "metadata": {
-                            "id": "0000000000000000000186b7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "subscription": "sub_7XTFyPwPpMod2T",
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -684,11 +617,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNHF276hw9Ic",
+                        "id": "sub_7XTFyPwPpMod2T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365147,
-                        "current_period_start": 1449686747,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
@@ -696,42 +629,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNS5E09bpvSk",
+                        "id": "sub_7XTFw0E8QlBiDM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365146,
-                        "current_period_start": 1449686746,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNPC9EZ6JGhE",
-                            "subscription": "sub_7VDNS5E09bpvSk"
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -743,29 +676,111 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwgKaReE7xLUdQgRhKcNI",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "in_17GCwgKaReE7xLUdQgRhKcNI",
-            "customer": "cus_7VDNPC9EZ6JGhE",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDNPC9EZ6JGhE",
-                "subscription": "sub_7VDNS5E09bpvSk"
+            "id": "cus_7XTFw5oPfEF5mE",
+            "alipay_accounts": {
+                "has_more": false
             },
-            "lines": {
+            "email": "user21@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b7"
+            },
+            "sources": {
                 "data": [
                     {
-                        "id": "sub_7VDNS5E09bpvSk",
-                        "amount": 999,
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFyPwPpMod2T",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTFw0E8QlBiDM",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
+                        },
                         "metadata": {
                             "id": "0000000000000000000186b6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTFcIzmo5v4FJ",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/invoices/in_17IOJ8KaReE7xLUd4sINXxLJ",
+        "status": 200,
+        "response": {
+            "id": "in_17IOJ8KaReE7xLUd4sINXxLJ",
+            "customer": "cus_7XTFw5oPfEF5mE",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTFw5oPfEF5mE",
+                "subscription": "sub_7XTFw0E8QlBiDM"
+            },
+            "lines": {
+                "data": [
+                    {
+                        "id": "sub_7XTFw0E8QlBiDM",
+                        "amount": 100,
+                        "metadata": {
+                            "id": "0000000000000000000186b6"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -775,29 +790,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNS5E09bpvSk",
+            "subscription": "sub_7XTFw0E8QlBiDM",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwdKaReE7xLUdRLGvAqaG",
+        "path": "/v1/invoices/in_17IOJ6KaReE7xLUdBE1OY0Lx",
         "status": 200,
         "response": {
-            "id": "in_17GCwdKaReE7xLUdRLGvAqaG",
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "id": "in_17IOJ6KaReE7xLUdBE1OY0Lx",
+            "customer": "cus_7XTFw5oPfEF5mE",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
-                        "amount": 999,
+                        "id": "sub_7XTFcIzmo5v4FJ",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -807,34 +822,34 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNR05m6WWAeS",
-            "total": 999
+            "subscription": "sub_7XTFcIzmo5v4FJ",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions/sub_7VDNS5E09bpvSk",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions/sub_7XTFw0E8QlBiDM",
         "status": 200,
         "response": {
-            "id": "sub_7VDNS5E09bpvSk",
+            "id": "sub_7XTFw0E8QlBiDM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365146,
-            "current_period_start": 1449686746,
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "current_period_end": 1452885478,
+            "current_period_start": 1450207078,
+            "customer": "cus_7XTFw5oPfEF5mE",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNPC9EZ6JGhE",
-                "subscription": "sub_7VDNS5E09bpvSk"
+                "customer": "cus_7XTFw5oPfEF5mE",
+                "subscription": "sub_7XTFw0E8QlBiDM"
             },
             "metadata": {
                 "id": "0000000000000000000186b6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -842,22 +857,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
         "status": 200,
         "response": {
-            "id": "cus_7VDNPC9EZ6JGhE",
+            "id": "cus_7XTFw5oPfEF5mE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user121@me.com",
+            "email": "user21@me.com",
             "metadata": {
                 "id": "0000000000000000000186b7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwbKaReE7xLUd5IJIFWBp",
-                        "customer": "cus_7VDNPC9EZ6JGhE"
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
                     }
                 ],
                 "has_more": false
@@ -865,11 +880,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNHF276hw9Ic",
+                        "id": "sub_7XTFyPwPpMod2T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365147,
-                        "current_period_start": 1449686747,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
@@ -877,42 +892,124 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDNS5E09bpvSk",
+                        "id": "sub_7XTFw0E8QlBiDM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365146,
-                        "current_period_start": 1449686746,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNPC9EZ6JGhE",
-                            "subscription": "sub_7VDNS5E09bpvSk"
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNR05m6WWAeS",
+                        "id": "sub_7XTFcIzmo5v4FJ",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365143,
-                        "current_period_start": 1449686743,
-                        "customer": "cus_7VDNPC9EZ6JGhE",
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
                         "metadata": {
                             "id": "0000000000000000000186b7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTFw5oPfEF5mE",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user21@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b7"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJ4KaReE7xLUdcyI7BPAp",
+                        "customer": "cus_7XTFw5oPfEF5mE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFyPwPpMod2T",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885479,
+                        "current_period_start": 1450207079,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTFw0E8QlBiDM",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885478,
+                        "current_period_start": 1450207078,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFw5oPfEF5mE",
+                            "subscription": "sub_7XTFw0E8QlBiDM"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b6"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTFcIzmo5v4FJ",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885476,
+                        "current_period_start": 1450207076,
+                        "customer": "cus_7XTFw5oPfEF5mE",
+                        "metadata": {
+                            "id": "0000000000000000000186b7"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -924,27 +1021,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions/sub_7VDNS5E09bpvSk",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions/sub_7XTFw0E8QlBiDM",
         "status": 200,
         "response": {
-            "id": "sub_7VDNS5E09bpvSk",
+            "id": "sub_7XTFw0E8QlBiDM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365146,
-            "current_period_start": 1449686746,
-            "customer": "cus_7VDNPC9EZ6JGhE",
+            "current_period_end": 1452885478,
+            "current_period_start": 1450207078,
+            "customer": "cus_7XTFw5oPfEF5mE",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNPC9EZ6JGhE",
-                "subscription": "sub_7VDNS5E09bpvSk"
+                "customer": "cus_7XTFw5oPfEF5mE",
+                "subscription": "sub_7XTFw0E8QlBiDM"
             },
             "metadata": {
                 "id": "0000000000000000000186b6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -952,16 +1049,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNPC9EZ6JGhE/subscriptions",
+        "path": "/v1/customers/cus_7XTFw5oPfEF5mE/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDNHF276hw9Ic",
+                    "id": "sub_7XTFyPwPpMod2T",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365147,
-                    "current_period_start": 1449686747,
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "current_period_end": 1452885479,
+                    "current_period_start": 1450207079,
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "metadata": {
                         "id": "0000000000000000000186b7"
                     },
@@ -969,20 +1066,20 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 799
+                    "quantity": 80
                 },
                 {
-                    "id": "sub_7VDNR05m6WWAeS",
+                    "id": "sub_7XTFcIzmo5v4FJ",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365143,
-                    "current_period_start": 1449686743,
-                    "customer": "cus_7VDNPC9EZ6JGhE",
+                    "current_period_end": 1452885476,
+                    "current_period_start": 1450207076,
+                    "customer": "cus_7XTFw5oPfEF5mE",
                     "metadata": {
                         "id": "0000000000000000000186b7"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
diff --git a/spec/fixtures/sub-test-17.json b/spec/fixtures/sub-test-17.json
index e180e0f2e..d70591f16 100644
--- a/spec/fixtures/sub-test-17.json
+++ b/spec/fixtures/sub-test-17.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCwmKaReE7xLUdpl5Q3yOw",
+            "id": "tok_17IOJGKaReE7xLUdjHIYvnK0",
             "card": {
-                "id": "card_17GCwmKaReE7xLUd3sr8m76Y"
+                "id": "card_17IOJGKaReE7xLUdNxTiPQwJ"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -43,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -52,22 +52,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -80,27 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNbSQlfeeWHJ",
+            "id": "sub_7XTFYjkQGllgRb",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365155,
-            "current_period_start": 1449686755,
-            "customer": "cus_7VDNJTygSygz49",
+            "current_period_end": 1452885488,
+            "current_period_start": 1450207088,
+            "customer": "cus_7XTF72ojYx00sO",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNJTygSygz49",
-                "subscription": "sub_7VDNbSQlfeeWHJ"
+                "customer": "cus_7XTF72ojYx00sO",
+                "subscription": "sub_7XTFYjkQGllgRb"
             },
             "metadata": {
                 "id": "0000000000000000000186b8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,14 +108,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNDyYKMgd89h",
+            "id": "sub_7XTFPmzBTEpFWA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365156,
-            "current_period_start": 1449686756,
-            "customer": "cus_7VDNJTygSygz49",
+            "current_period_end": 1452885489,
+            "current_period_start": 1450207089,
+            "customer": "cus_7XTF72ojYx00sO",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
@@ -123,7 +123,74 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTF72ojYx00sO",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user23@me.com",
+            "metadata": {
+                "id": "0000000000000000000186b9"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTFPmzBTEpFWA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885489,
+                        "current_period_start": 1450207089,
+                        "customer": "cus_7XTF72ojYx00sO",
+                        "metadata": {
+                            "id": "0000000000000000000186b9"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTFYjkQGllgRb",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885488,
+                        "current_period_start": 1450207088,
+                        "customer": "cus_7XTF72ojYx00sO",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTF72ojYx00sO",
+                            "subscription": "sub_7XTFYjkQGllgRb"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186b8"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -134,13 +201,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwqKaReE7xLUdkrPY6enO",
-                    "customer": "cus_7VDNJTygSygz49",
+                    "id": "in_17IOJJKaReE7xLUdDSnL0sv2",
+                    "customer": "cus_7XTF72ojYx00sO",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNDyYKMgd89h",
-                                "amount": 999,
+                                "id": "sub_7XTFPmzBTEpFWA",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b9"
                                 },
@@ -149,37 +216,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNDyYKMgd89h",
-                    "total": 999
+                    "subscription": "sub_7XTFPmzBTEpFWA",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCwpKaReE7xLUdsuaebpGq",
-                    "customer": "cus_7VDNJTygSygz49",
+                    "id": "in_17IOJIKaReE7xLUdKUix9d3e",
+                    "customer": "cus_7XTF72ojYx00sO",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNJTygSygz49",
-                        "subscription": "sub_7VDNbSQlfeeWHJ"
+                        "customer": "cus_7XTF72ojYx00sO",
+                        "subscription": "sub_7XTFYjkQGllgRb"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNbSQlfeeWHJ",
-                                "amount": 999,
+                                "id": "sub_7XTFYjkQGllgRb",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186b8"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -189,7 +256,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNbSQlfeeWHJ",
+                    "subscription": "sub_7XTFYjkQGllgRb",
                     "total": 0
                 }
             ],
@@ -199,22 +266,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -222,11 +289,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNDyYKMgd89h",
+                        "id": "sub_7XTFPmzBTEpFWA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885489,
+                        "current_period_start": 1450207089,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "metadata": {
                             "id": "0000000000000000000186b9"
                         },
@@ -234,27 +301,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNbSQlfeeWHJ",
+                        "id": "sub_7XTFYjkQGllgRb",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365155,
-                        "current_period_start": 1449686755,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885488,
+                        "current_period_start": 1450207088,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNJTygSygz49",
-                            "subscription": "sub_7VDNbSQlfeeWHJ"
+                            "customer": "cus_7XTF72ojYx00sO",
+                            "subscription": "sub_7XTFYjkQGllgRb"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -266,22 +333,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -289,11 +356,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNDyYKMgd89h",
+                        "id": "sub_7XTFPmzBTEpFWA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885489,
+                        "current_period_start": 1450207089,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "metadata": {
                             "id": "0000000000000000000186b9"
                         },
@@ -301,27 +368,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNbSQlfeeWHJ",
+                        "id": "sub_7XTFYjkQGllgRb",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365155,
-                        "current_period_start": 1449686755,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885488,
+                        "current_period_start": 1450207088,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNJTygSygz49",
-                            "subscription": "sub_7VDNbSQlfeeWHJ"
+                            "customer": "cus_7XTF72ojYx00sO",
+                            "subscription": "sub_7XTFYjkQGllgRb"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -333,16 +400,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwqKaReE7xLUdkrPY6enO",
+        "path": "/v1/invoices/in_17IOJJKaReE7xLUdDSnL0sv2",
         "status": 200,
         "response": {
-            "id": "in_17GCwqKaReE7xLUdkrPY6enO",
-            "customer": "cus_7VDNJTygSygz49",
+            "id": "in_17IOJJKaReE7xLUdDSnL0sv2",
+            "customer": "cus_7XTF72ojYx00sO",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNDyYKMgd89h",
-                        "amount": 999,
+                        "id": "sub_7XTFPmzBTEpFWA",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b9"
                         },
@@ -351,36 +418,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNDyYKMgd89h",
-            "total": 999
+            "subscription": "sub_7XTFPmzBTEpFWA",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -388,11 +455,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNDyYKMgd89h",
+                        "id": "sub_7XTFPmzBTEpFWA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885489,
+                        "current_period_start": 1450207089,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "metadata": {
                             "id": "0000000000000000000186b9"
                         },
@@ -400,27 +467,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNbSQlfeeWHJ",
+                        "id": "sub_7XTFYjkQGllgRb",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365155,
-                        "current_period_start": 1449686755,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885488,
+                        "current_period_start": 1450207088,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNJTygSygz49",
-                            "subscription": "sub_7VDNbSQlfeeWHJ"
+                            "customer": "cus_7XTF72ojYx00sO",
+                            "subscription": "sub_7XTFYjkQGllgRb"
                         },
                         "metadata": {
                             "id": "0000000000000000000186b8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -432,96 +499,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "path": "/v1/invoices/in_17IOJIKaReE7xLUdKUix9d3e",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user123@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b9"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNDyYKMgd89h",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
-                        "metadata": {
-                            "id": "0000000000000000000186b9"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDNbSQlfeeWHJ",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365155,
-                        "current_period_start": 1449686755,
-                        "customer": "cus_7VDNJTygSygz49",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDNJTygSygz49",
-                            "subscription": "sub_7VDNbSQlfeeWHJ"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186b8"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCwpKaReE7xLUdsuaebpGq",
-        "status": 200,
-        "response": {
-            "id": "in_17GCwpKaReE7xLUdsuaebpGq",
-            "customer": "cus_7VDNJTygSygz49",
+            "id": "in_17IOJIKaReE7xLUdKUix9d3e",
+            "customer": "cus_7XTF72ojYx00sO",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNJTygSygz49",
-                "subscription": "sub_7VDNbSQlfeeWHJ"
+                "customer": "cus_7XTF72ojYx00sO",
+                "subscription": "sub_7XTFYjkQGllgRb"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNbSQlfeeWHJ",
-                        "amount": 999,
+                        "id": "sub_7XTFYjkQGllgRb",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186b8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -531,34 +531,34 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNbSQlfeeWHJ",
+            "subscription": "sub_7XTFYjkQGllgRb",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions/sub_7VDNbSQlfeeWHJ",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions/sub_7XTFYjkQGllgRb",
         "status": 200,
         "response": {
-            "id": "sub_7VDNbSQlfeeWHJ",
+            "id": "sub_7XTFYjkQGllgRb",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365155,
-            "current_period_start": 1449686755,
-            "customer": "cus_7VDNJTygSygz49",
+            "current_period_end": 1452885488,
+            "current_period_start": 1450207088,
+            "customer": "cus_7XTF72ojYx00sO",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNJTygSygz49",
-                "subscription": "sub_7VDNbSQlfeeWHJ"
+                "customer": "cus_7XTF72ojYx00sO",
+                "subscription": "sub_7XTFYjkQGllgRb"
             },
             "metadata": {
                 "id": "0000000000000000000186b8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -566,27 +566,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions/sub_7VDNbSQlfeeWHJ",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions/sub_7XTFYjkQGllgRb",
         "status": 200,
         "response": {
-            "id": "sub_7VDNbSQlfeeWHJ",
+            "id": "sub_7XTFYjkQGllgRb",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365155,
-            "current_period_start": 1449686755,
-            "customer": "cus_7VDNJTygSygz49",
+            "current_period_end": 1452885488,
+            "current_period_start": 1450207088,
+            "customer": "cus_7XTF72ojYx00sO",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNJTygSygz49",
-                "subscription": "sub_7VDNbSQlfeeWHJ"
+                "customer": "cus_7XTF72ojYx00sO",
+                "subscription": "sub_7XTFYjkQGllgRb"
             },
             "metadata": {
                 "id": "0000000000000000000186b8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -594,22 +594,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO",
         "status": 200,
         "response": {
-            "id": "cus_7VDNJTygSygz49",
+            "id": "cus_7XTF72ojYx00sO",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user123@me.com",
+            "email": "user23@me.com",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
+                        "id": "card_17IOJGKaReE7xLUdNxTiPQwJ",
+                        "customer": "cus_7XTF72ojYx00sO"
                     }
                 ],
                 "has_more": false
@@ -617,11 +617,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNDyYKMgd89h",
+                        "id": "sub_7XTFPmzBTEpFWA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
+                        "current_period_end": 1452885489,
+                        "current_period_start": 1450207089,
+                        "customer": "cus_7XTF72ojYx00sO",
                         "metadata": {
                             "id": "0000000000000000000186b9"
                         },
@@ -629,7 +629,7 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     }
                 ],
                 "has_more": false
@@ -639,14 +639,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions/sub_7VDNDyYKMgd89h",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions/sub_7XTFPmzBTEpFWA",
         "status": 200,
         "response": {
-            "id": "sub_7VDNDyYKMgd89h",
+            "id": "sub_7XTFPmzBTEpFWA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365156,
-            "current_period_start": 1449686756,
-            "customer": "cus_7VDNJTygSygz49",
+            "current_period_end": 1452885489,
+            "current_period_start": 1450207089,
+            "customer": "cus_7XTF72ojYx00sO",
             "metadata": {
                 "id": "0000000000000000000186b9"
             },
@@ -657,64 +657,19 @@
             "quantity": 0
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNJTygSygz49",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDNJTygSygz49",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user123@me.com",
-            "metadata": {
-                "id": "0000000000000000000186b9"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwmKaReE7xLUd3sr8m76Y",
-                        "customer": "cus_7VDNJTygSygz49"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNDyYKMgd89h",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365156,
-                        "current_period_start": 1449686756,
-                        "customer": "cus_7VDNJTygSygz49",
-                        "metadata": {
-                            "id": "0000000000000000000186b9"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 0
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNJTygSygz49/subscriptions",
+        "path": "/v1/customers/cus_7XTF72ojYx00sO/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDNDyYKMgd89h",
+                    "id": "sub_7XTFPmzBTEpFWA",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365156,
-                    "current_period_start": 1449686756,
-                    "customer": "cus_7VDNJTygSygz49",
+                    "current_period_end": 1452885489,
+                    "current_period_start": 1450207089,
+                    "customer": "cus_7XTF72ojYx00sO",
                     "metadata": {
                         "id": "0000000000000000000186b9"
                     },
diff --git a/spec/fixtures/sub-test-18.json b/spec/fixtures/sub-test-18.json
index 12a5b75c9..a38a4b83d 100644
--- a/spec/fixtures/sub-test-18.json
+++ b/spec/fixtures/sub-test-18.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCwwKaReE7xLUdykvY9I8c",
+            "id": "tok_17IOJQKaReE7xLUdhpjUEGLz",
             "card": {
-                "id": "card_17GCwwKaReE7xLUdbt92OyM5"
+                "id": "card_17IOJQKaReE7xLUdeoQIhv84"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user125@me.com",
-            "metadata": {
-                "id": "0000000000000000000186bb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +52,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "sub_7VDNj1BJ6IyEzR",
+            "id": "cus_7XTFA3maH8ej03",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user25@me.com",
+            "metadata": {
+                "id": "0000000000000000000186bb"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTF7Myb4FvmEy",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365164,
-            "current_period_start": 1449686764,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885498,
+            "current_period_start": 1450207098,
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNj1BJ6IyEzR"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTF7Myb4FvmEy"
             },
             "metadata": {
                 "id": "0000000000000000000186ba"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNj1BJ6IyEzR",
+                        "id": "sub_7XTF7Myb4FvmEy",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365164,
-                        "current_period_start": 1449686764,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885498,
+                        "current_period_start": 1450207098,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNj1BJ6IyEzR"
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTF7Myb4FvmEy"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNqiPOSQDgH4",
+            "id": "sub_7XTF2kSoMCmH51",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365165,
-            "current_period_start": 1449686765,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885499,
+            "current_period_start": 1450207099,
+            "customer": "cus_7XTFA3maH8ej03",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
@@ -175,7 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCwzKaReE7xLUdpyCrFPH1",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJTKaReE7xLUdl0eMQ9Aw",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNqiPOSQDgH4",
-                                "amount": 999,
+                                "id": "sub_7XTF2kSoMCmH51",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bb"
                                 },
@@ -201,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNqiPOSQDgH4",
-                    "total": 999
+                    "subscription": "sub_7XTF2kSoMCmH51",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCwyKaReE7xLUdtCFo3S04",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJSKaReE7xLUdn7hyC1Ve",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "subscription": "sub_7VDNj1BJ6IyEzR"
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "subscription": "sub_7XTF7Myb4FvmEy"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNj1BJ6IyEzR",
-                                "amount": 999,
+                                "id": "sub_7XTF7Myb4FvmEy",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ba"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNj1BJ6IyEzR",
+                    "subscription": "sub_7XTF7Myb4FvmEy",
                     "total": 0
                 }
             ],
@@ -251,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -274,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -286,27 +286,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNj1BJ6IyEzR",
+                        "id": "sub_7XTF7Myb4FvmEy",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365164,
-                        "current_period_start": 1449686764,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885498,
+                        "current_period_start": 1450207098,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNj1BJ6IyEzR"
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTF7Myb4FvmEy"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTFA3maH8ej03",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user25@me.com",
+            "metadata": {
+                "id": "0000000000000000000186bb"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTF2kSoMCmH51",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "metadata": {
+                            "id": "0000000000000000000186bb"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTF7Myb4FvmEy",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885498,
+                        "current_period_start": 1450207098,
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTF7Myb4FvmEy"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186ba"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCwzKaReE7xLUdpyCrFPH1",
+        "path": "/v1/invoices/in_17IOJTKaReE7xLUdl0eMQ9Aw",
         "status": 200,
         "response": {
-            "id": "in_17GCwzKaReE7xLUdpyCrFPH1",
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "id": "in_17IOJTKaReE7xLUdl0eMQ9Aw",
+            "customer": "cus_7XTFA3maH8ej03",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
-                        "amount": 999,
+                        "id": "sub_7XTF2kSoMCmH51",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -336,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNqiPOSQDgH4",
-            "total": 999
+            "subscription": "sub_7XTF2kSoMCmH51",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -373,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -385,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNj1BJ6IyEzR",
+                        "id": "sub_7XTF7Myb4FvmEy",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365164,
-                        "current_period_start": 1449686764,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885498,
+                        "current_period_start": 1450207098,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNj1BJ6IyEzR"
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTF7Myb4FvmEy"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,96 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/invoices/in_17IOJSKaReE7xLUdn7hyC1Ve",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user125@me.com",
-            "metadata": {
-                "id": "0000000000000000000186bb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNqiPOSQDgH4",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "metadata": {
-                            "id": "0000000000000000000186bb"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDNj1BJ6IyEzR",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365164,
-                        "current_period_start": 1449686764,
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNj1BJ6IyEzR"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ba"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCwyKaReE7xLUdtCFo3S04",
-        "status": 200,
-        "response": {
-            "id": "in_17GCwyKaReE7xLUdtCFo3S04",
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "id": "in_17IOJSKaReE7xLUdn7hyC1Ve",
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNj1BJ6IyEzR"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTF7Myb4FvmEy"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNj1BJ6IyEzR",
-                        "amount": 999,
+                        "id": "sub_7XTF7Myb4FvmEy",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,34 +516,34 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNj1BJ6IyEzR",
+            "subscription": "sub_7XTF7Myb4FvmEy",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNj1BJ6IyEzR",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTF7Myb4FvmEy",
         "status": 200,
         "response": {
-            "id": "sub_7VDNj1BJ6IyEzR",
+            "id": "sub_7XTF7Myb4FvmEy",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365164,
-            "current_period_start": 1449686764,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885498,
+            "current_period_start": 1450207098,
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNj1BJ6IyEzR"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTF7Myb4FvmEy"
             },
             "metadata": {
                 "id": "0000000000000000000186ba"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -551,27 +551,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNj1BJ6IyEzR",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTF7Myb4FvmEy",
         "status": 200,
         "response": {
-            "id": "sub_7VDNj1BJ6IyEzR",
+            "id": "sub_7XTF7Myb4FvmEy",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365164,
-            "current_period_start": 1449686764,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885498,
+            "current_period_start": 1450207098,
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNj1BJ6IyEzR"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTF7Myb4FvmEy"
             },
             "metadata": {
                 "id": "0000000000000000000186ba"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -579,22 +579,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -602,11 +602,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -614,7 +614,7 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     }
                 ],
                 "has_more": false
@@ -624,14 +624,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNqiPOSQDgH4",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTF2kSoMCmH51",
         "status": 200,
         "response": {
-            "id": "sub_7VDNqiPOSQDgH4",
+            "id": "sub_7XTF2kSoMCmH51",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365165,
-            "current_period_start": 1449686765,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885499,
+            "current_period_start": 1450207099,
+            "customer": "cus_7XTFA3maH8ej03",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
@@ -645,22 +645,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -668,11 +668,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -690,22 +690,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -713,11 +713,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -735,16 +735,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDNqiPOSQDgH4",
+                    "id": "sub_7XTF2kSoMCmH51",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365165,
-                    "current_period_start": 1449686765,
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "current_period_end": 1452885499,
+                    "current_period_start": 1450207099,
+                    "customer": "cus_7XTFA3maH8ej03",
                     "metadata": {
                         "id": "0000000000000000000186bb"
                     },
@@ -761,98 +761,50 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNQ6oukVnouu",
+            "id": "sub_7XTGObi7jvhdcI",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365172,
-            "current_period_start": 1449686772,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885507,
+            "current_period_start": 1450207107,
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNQ6oukVnouu"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTGObi7jvhdcI"
             },
             "metadata": {
                 "id": "0000000000000000000186ba"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions",
-        "status": 200,
-        "response": {
-            "data": [
-                {
-                    "id": "sub_7VDNQ6oukVnouu",
-                    "cancel_at_period_end": false,
-                    "current_period_end": 1452365172,
-                    "current_period_start": 1449686772,
-                    "customer": "cus_7VDNEbpCO5sH6A",
-                    "discount": {
-                        "coupon": {
-                            "id": "free"
-                        },
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "subscription": "sub_7VDNQ6oukVnouu"
-                    },
-                    "metadata": {
-                        "id": "0000000000000000000186ba"
-                    },
-                    "plan": {
-                        "id": "basic",
-                        "amount": 999
-                    },
-                    "quantity": 1
-                },
-                {
-                    "id": "sub_7VDNqiPOSQDgH4",
-                    "cancel_at_period_end": false,
-                    "current_period_end": 1452365165,
-                    "current_period_start": 1449686765,
-                    "customer": "cus_7VDNEbpCO5sH6A",
-                    "metadata": {
-                        "id": "0000000000000000000186bb"
-                    },
-                    "plan": {
-                        "id": "incremental",
-                        "amount": 1
-                    },
-                    "quantity": 0
-                }
-            ],
-            "has_more": false
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -860,33 +812,33 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNQ6oukVnouu",
+                        "id": "sub_7XTGObi7jvhdcI",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365172,
-                        "current_period_start": 1449686772,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885507,
+                        "current_period_start": 1450207107,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNQ6oukVnouu"
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTGObi7jvhdcI"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -903,15 +855,63 @@
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNqiPOSQDgH4",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDNqiPOSQDgH4",
+            "data": [
+                {
+                    "id": "sub_7XTGObi7jvhdcI",
+                    "cancel_at_period_end": false,
+                    "current_period_end": 1452885507,
+                    "current_period_start": 1450207107,
+                    "customer": "cus_7XTFA3maH8ej03",
+                    "discount": {
+                        "coupon": {
+                            "id": "free"
+                        },
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "subscription": "sub_7XTGObi7jvhdcI"
+                    },
+                    "metadata": {
+                        "id": "0000000000000000000186ba"
+                    },
+                    "plan": {
+                        "id": "basic",
+                        "amount": 100
+                    },
+                    "quantity": 1
+                },
+                {
+                    "id": "sub_7XTF2kSoMCmH51",
+                    "cancel_at_period_end": false,
+                    "current_period_end": 1452885499,
+                    "current_period_start": 1450207099,
+                    "customer": "cus_7XTFA3maH8ej03",
+                    "metadata": {
+                        "id": "0000000000000000000186bb"
+                    },
+                    "plan": {
+                        "id": "incremental",
+                        "amount": 1
+                    },
+                    "quantity": 0
+                }
+            ],
+            "has_more": false
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTF2kSoMCmH51",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTF2kSoMCmH51",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365165,
-            "current_period_start": 1449686765,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885499,
+            "current_period_start": 1450207099,
+            "customer": "cus_7XTFA3maH8ej03",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
@@ -919,7 +919,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -928,34 +928,34 @@
         "path": "/v1/invoices",
         "status": 200,
         "response": {
-            "id": "in_17GCx9KaReE7xLUdnX0p490o",
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "id": "in_17IOJeKaReE7xLUdYpGIFuIU",
+            "customer": "cus_7XTFA3maH8ej03",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCx8KaReE7xLUdNnsvlikN",
-                        "amount": 999,
-                        "description": "Remaining time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOJdKaReE7xLUdLflweM7T",
+                        "amount": 100,
+                        "description": "Remaining time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDNqiPOSQDgH4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTF2kSoMCmH51",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCx5KaReE7xLUdfkXDiRI5",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOJZKaReE7xLUddtg0bR55",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDNqiPOSQDgH4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTF2kSoMCmH51",
                         "type": "invoiceitem"
                     }
                 ],
@@ -973,34 +973,34 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCx9KaReE7xLUdnX0p490o",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJeKaReE7xLUdYpGIFuIU",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "lines": {
                         "data": [
                             {
-                                "id": "ii_17GCx8KaReE7xLUdNnsvlikN",
-                                "amount": 999,
-                                "description": "Remaining time on 999 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOJdKaReE7xLUdLflweM7T",
+                                "amount": 100,
+                                "description": "Remaining time on 100 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 999,
-                                "subscription": "sub_7VDNqiPOSQDgH4",
+                                "quantity": 100,
+                                "subscription": "sub_7XTF2kSoMCmH51",
                                 "type": "invoiceitem"
                             },
                             {
-                                "id": "ii_17GCx5KaReE7xLUdfkXDiRI5",
-                                "amount": -999,
-                                "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOJZKaReE7xLUddtg0bR55",
+                                "amount": -100,
+                                "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 999,
-                                "subscription": "sub_7VDNqiPOSQDgH4",
+                                "quantity": 100,
+                                "subscription": "sub_7XTF2kSoMCmH51",
                                 "type": "invoiceitem"
                             }
                         ],
@@ -1010,26 +1010,26 @@
                     "total": 0
                 },
                 {
-                    "id": "in_17GCx6KaReE7xLUd9o45iCRw",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJbKaReE7xLUd7izm1cS9",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "subscription": "sub_7VDNQ6oukVnouu"
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "subscription": "sub_7XTGObi7jvhdcI"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNQ6oukVnouu",
-                                "amount": 999,
+                                "id": "sub_7XTGObi7jvhdcI",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ba"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1039,17 +1039,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNQ6oukVnouu",
+                    "subscription": "sub_7XTGObi7jvhdcI",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCwzKaReE7xLUdpyCrFPH1",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJTKaReE7xLUdl0eMQ9Aw",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNqiPOSQDgH4",
-                                "amount": 999,
+                                "id": "sub_7XTF2kSoMCmH51",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bb"
                                 },
@@ -1058,37 +1058,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNqiPOSQDgH4",
-                    "total": 999
+                    "subscription": "sub_7XTF2kSoMCmH51",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCwyKaReE7xLUdtCFo3S04",
-                    "customer": "cus_7VDNEbpCO5sH6A",
+                    "id": "in_17IOJSKaReE7xLUdn7hyC1Ve",
+                    "customer": "cus_7XTFA3maH8ej03",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNEbpCO5sH6A",
-                        "subscription": "sub_7VDNj1BJ6IyEzR"
+                        "customer": "cus_7XTFA3maH8ej03",
+                        "subscription": "sub_7XTF7Myb4FvmEy"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNj1BJ6IyEzR",
-                                "amount": 999,
+                                "id": "sub_7XTF7Myb4FvmEy",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ba"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1098,7 +1098,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNj1BJ6IyEzR",
+                    "subscription": "sub_7XTF7Myb4FvmEy",
                     "total": 0
                 }
             ],
@@ -1108,22 +1108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03",
         "status": 200,
         "response": {
-            "id": "cus_7VDNEbpCO5sH6A",
+            "id": "cus_7XTFA3maH8ej03",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user125@me.com",
+            "email": "user25@me.com",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCwwKaReE7xLUdbt92OyM5",
-                        "customer": "cus_7VDNEbpCO5sH6A"
+                        "id": "card_17IOJQKaReE7xLUdeoQIhv84",
+                        "customer": "cus_7XTFA3maH8ej03"
                     }
                 ],
                 "has_more": false
@@ -1131,11 +1131,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDNqiPOSQDgH4",
+                        "id": "sub_7XTF2kSoMCmH51",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365165,
-                        "current_period_start": 1449686765,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885499,
+                        "current_period_start": 1450207099,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "metadata": {
                             "id": "0000000000000000000186bb"
                         },
@@ -1143,27 +1143,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNQ6oukVnouu",
+                        "id": "sub_7XTGObi7jvhdcI",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365172,
-                        "current_period_start": 1449686772,
-                        "customer": "cus_7VDNEbpCO5sH6A",
+                        "current_period_end": 1452885507,
+                        "current_period_start": 1450207107,
+                        "customer": "cus_7XTFA3maH8ej03",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNEbpCO5sH6A",
-                            "subscription": "sub_7VDNQ6oukVnouu"
+                            "customer": "cus_7XTFA3maH8ej03",
+                            "subscription": "sub_7XTGObi7jvhdcI"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1175,37 +1175,37 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCx9KaReE7xLUdnX0p490o",
+        "path": "/v1/invoices/in_17IOJeKaReE7xLUdYpGIFuIU",
         "status": 200,
         "response": {
-            "id": "in_17GCx9KaReE7xLUdnX0p490o",
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "id": "in_17IOJeKaReE7xLUdYpGIFuIU",
+            "customer": "cus_7XTFA3maH8ej03",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCx8KaReE7xLUdNnsvlikN",
-                        "amount": 999,
-                        "description": "Remaining time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOJdKaReE7xLUdLflweM7T",
+                        "amount": 100,
+                        "description": "Remaining time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDNqiPOSQDgH4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTF2kSoMCmH51",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCx5KaReE7xLUdfkXDiRI5",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOJZKaReE7xLUddtg0bR55",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDNqiPOSQDgH4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTF2kSoMCmH51",
                         "type": "invoiceitem"
                     }
                 ],
@@ -1218,29 +1218,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCx6KaReE7xLUd9o45iCRw",
+        "path": "/v1/invoices/in_17IOJbKaReE7xLUd7izm1cS9",
         "status": 200,
         "response": {
-            "id": "in_17GCx6KaReE7xLUd9o45iCRw",
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "id": "in_17IOJbKaReE7xLUd7izm1cS9",
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNQ6oukVnouu"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTGObi7jvhdcI"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNQ6oukVnouu",
-                        "amount": 999,
+                        "id": "sub_7XTGObi7jvhdcI",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186ba"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1250,21 +1250,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNQ6oukVnouu",
+            "subscription": "sub_7XTGObi7jvhdcI",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNqiPOSQDgH4",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTF2kSoMCmH51",
         "status": 200,
         "response": {
-            "id": "sub_7VDNqiPOSQDgH4",
+            "id": "sub_7XTF2kSoMCmH51",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365165,
-            "current_period_start": 1449686765,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885499,
+            "current_period_start": 1450207099,
+            "customer": "cus_7XTFA3maH8ej03",
             "metadata": {
                 "id": "0000000000000000000186bb"
             },
@@ -1272,33 +1272,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNEbpCO5sH6A/subscriptions/sub_7VDNQ6oukVnouu",
+        "path": "/v1/customers/cus_7XTFA3maH8ej03/subscriptions/sub_7XTGObi7jvhdcI",
         "status": 200,
         "response": {
-            "id": "sub_7VDNQ6oukVnouu",
+            "id": "sub_7XTGObi7jvhdcI",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365172,
-            "current_period_start": 1449686772,
-            "customer": "cus_7VDNEbpCO5sH6A",
+            "current_period_end": 1452885507,
+            "current_period_start": 1450207107,
+            "customer": "cus_7XTFA3maH8ej03",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNEbpCO5sH6A",
-                "subscription": "sub_7VDNQ6oukVnouu"
+                "customer": "cus_7XTFA3maH8ej03",
+                "subscription": "sub_7XTGObi7jvhdcI"
             },
             "metadata": {
                 "id": "0000000000000000000186ba"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-19.json b/spec/fixtures/sub-test-19.json
index 77170deb1..90b19e213 100644
--- a/spec/fixtures/sub-test-19.json
+++ b/spec/fixtures/sub-test-19.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxCKaReE7xLUdQSKb76Nv",
+            "id": "tok_17IOJiKaReE7xLUdVH4lYvOg",
             "card": {
-                "id": "card_17GCxCKaReE7xLUdtvT6QfQs"
+                "id": "card_17IOJiKaReE7xLUdv9iI4RIM"
             },
             "type": "card"
         }
@@ -18,19 +18,47 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGhDZ4ZeZUuR",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user27@me.com",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTGhDZ4ZeZUuR",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user27@me.com",
+            "metadata": {
+                "id": "0000000000000000000186bd"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
                     }
                 ],
                 "has_more": false
@@ -43,7 +71,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe/subscriptions",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -52,55 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user127@me.com",
-            "metadata": {
-                "id": "0000000000000000000186bd"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDNFSXQ9g4sml",
+            "id": "sub_7XTGDdKycYxGfB",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365179,
-            "current_period_start": 1449686779,
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "current_period_end": 1452885516,
+            "current_period_start": 1450207116,
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNSO9XbQEgBe",
-                "subscription": "sub_7VDNFSXQ9g4sml"
+                "customer": "cus_7XTGhDZ4ZeZUuR",
+                "subscription": "sub_7XTGDdKycYxGfB"
             },
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,66 +108,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user127@me.com",
-            "metadata": {
-                "id": "0000000000000000000186bd"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDNFSXQ9g4sml",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186bc"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDONaO5dMKvmZ",
+            "id": "sub_7XTGPfHIGzSMTX",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365181,
-            "current_period_start": 1449686781,
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "current_period_end": 1452885517,
+            "current_period_start": 1450207117,
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
@@ -175,7 +123,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +134,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCxFKaReE7xLUdAib5kobP",
-                    "customer": "cus_7VDNSO9XbQEgBe",
+                    "id": "in_17IOJlKaReE7xLUdfOHEtskF",
+                    "customer": "cus_7XTGhDZ4ZeZUuR",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDONaO5dMKvmZ",
-                                "amount": 999,
+                                "id": "sub_7XTGPfHIGzSMTX",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bd"
                                 },
@@ -201,37 +149,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDONaO5dMKvmZ",
-                    "total": 999
+                    "subscription": "sub_7XTGPfHIGzSMTX",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCxDKaReE7xLUd6vwhouH3",
-                    "customer": "cus_7VDNSO9XbQEgBe",
+                    "id": "in_17IOJkKaReE7xLUdpioD0Mkn",
+                    "customer": "cus_7XTGhDZ4ZeZUuR",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDNSO9XbQEgBe",
-                        "subscription": "sub_7VDNFSXQ9g4sml"
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
+                        "subscription": "sub_7XTGDdKycYxGfB"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDNFSXQ9g4sml",
-                                "amount": 999,
+                                "id": "sub_7XTGDdKycYxGfB",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bc"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +189,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDNFSXQ9g4sml",
+                    "subscription": "sub_7XTGDdKycYxGfB",
                     "total": 0
                 }
             ],
@@ -251,22 +199,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGhDZ4ZeZUuR",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user27@me.com",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
                     }
                 ],
                 "has_more": false
@@ -274,11 +222,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
+                        "id": "sub_7XTGPfHIGzSMTX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365181,
-                        "current_period_start": 1449686781,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
@@ -286,27 +234,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNFSXQ9g4sml",
+                        "id": "sub_7XTGDdKycYxGfB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,16 +266,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxFKaReE7xLUdAib5kobP",
+        "path": "/v1/invoices/in_17IOJlKaReE7xLUdfOHEtskF",
         "status": 200,
         "response": {
-            "id": "in_17GCxFKaReE7xLUdAib5kobP",
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "id": "in_17IOJlKaReE7xLUdfOHEtskF",
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
-                        "amount": 999,
+                        "id": "sub_7XTGPfHIGzSMTX",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
@@ -336,36 +284,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDONaO5dMKvmZ",
-            "total": 999
+            "subscription": "sub_7XTGPfHIGzSMTX",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGhDZ4ZeZUuR",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user27@me.com",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
                     }
                 ],
                 "has_more": false
@@ -373,11 +321,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
+                        "id": "sub_7XTGPfHIGzSMTX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365181,
-                        "current_period_start": 1449686781,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
@@ -385,27 +333,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNFSXQ9g4sml",
+                        "id": "sub_7XTGDdKycYxGfB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTGhDZ4ZeZUuR",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user27@me.com",
+            "metadata": {
+                "id": "0000000000000000000186bd"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTGPfHIGzSMTX",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
+                        "metadata": {
+                            "id": "0000000000000000000186bd"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTGDdKycYxGfB",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186bc"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,22 +432,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGhDZ4ZeZUuR",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user27@me.com",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
                     }
                 ],
                 "has_more": false
@@ -440,11 +455,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
+                        "id": "sub_7XTGPfHIGzSMTX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365181,
-                        "current_period_start": 1449686781,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
@@ -452,27 +467,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNFSXQ9g4sml",
+                        "id": "sub_7XTGDdKycYxGfB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -484,29 +499,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxDKaReE7xLUd6vwhouH3",
+        "path": "/v1/invoices/in_17IOJkKaReE7xLUdpioD0Mkn",
         "status": 200,
         "response": {
-            "id": "in_17GCxDKaReE7xLUd6vwhouH3",
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "id": "in_17IOJkKaReE7xLUdpioD0Mkn",
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNSO9XbQEgBe",
-                "subscription": "sub_7VDNFSXQ9g4sml"
+                "customer": "cus_7XTGhDZ4ZeZUuR",
+                "subscription": "sub_7XTGDdKycYxGfB"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDNFSXQ9g4sml",
-                        "amount": 999,
+                        "id": "sub_7XTGDdKycYxGfB",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,7 +531,7 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDNFSXQ9g4sml",
+            "subscription": "sub_7XTGDdKycYxGfB",
             "total": 0
         }
     },
@@ -526,9 +541,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxIKaReE7xLUdDzODKROr",
+            "id": "tok_17IOJpKaReE7xLUdsn1kOBD8",
             "card": {
-                "id": "card_17GCxIKaReE7xLUdoGw57NP6"
+                "id": "card_17IOJpKaReE7xLUdqQSBpr4Y"
             },
             "type": "card"
         }
@@ -539,19 +554,47 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDOogGF1eEXu2",
+            "id": "cus_7XTGlpwKwRQl8i",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user126@foo.bar",
+            "email": "user26@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTGlpwKwRQl8i",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user26@foo.bar",
+            "metadata": {
+                "id": "0000000000000000000186bc"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
                     }
                 ],
                 "has_more": false
@@ -564,7 +607,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2/subscriptions",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -573,55 +616,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDOogGF1eEXu2",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user126@foo.bar",
-            "metadata": {
-                "id": "0000000000000000000186bc"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDOtfIZw7GnCq",
+            "id": "sub_7XTGbeUeeXApN3",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365185,
-            "current_period_start": 1449686785,
-            "customer": "cus_7VDOogGF1eEXu2",
+            "current_period_end": 1452885523,
+            "current_period_start": 1450207123,
+            "customer": "cus_7XTGlpwKwRQl8i",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOogGF1eEXu2",
-                "subscription": "sub_7VDOtfIZw7GnCq"
+                "customer": "cus_7XTGlpwKwRQl8i",
+                "subscription": "sub_7XTGbeUeeXApN3"
             },
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -629,22 +644,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGlpwKwRQl8i",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user26@foo.bar",
             "metadata": {
-                "id": "0000000000000000000186bd"
+                "id": "0000000000000000000186bc"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
                     }
                 ],
                 "has_more": false
@@ -652,39 +667,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
+                        "id": "sub_7XTGbeUeeXApN3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365181,
-                        "current_period_start": 1449686781,
-                        "customer": "cus_7VDNSO9XbQEgBe",
-                        "metadata": {
-                            "id": "0000000000000000000186bd"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDNFSXQ9g4sml",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885523,
+                        "current_period_start": 1450207123,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
+                            "customer": "cus_7XTGlpwKwRQl8i",
+                            "subscription": "sub_7XTGbeUeeXApN3"
                         },
                         "metadata": {
-                            "id": "0000000000000000000186bc"
+                            "id": "0000000000000000000186bd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -696,14 +696,81 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2/subscriptions",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
         "status": 200,
         "response": {
-            "id": "sub_7VDOrzrCjmPlCD",
+            "id": "cus_7XTGhDZ4ZeZUuR",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user27@me.com",
+            "metadata": {
+                "id": "0000000000000000000186bd"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTGPfHIGzSMTX",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
+                        "metadata": {
+                            "id": "0000000000000000000186bd"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTGDdKycYxGfB",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186bc"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTG24R4sUTmu5",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365186,
-            "current_period_start": 1449686786,
-            "customer": "cus_7VDOogGF1eEXu2",
+            "current_period_end": 1452885524,
+            "current_period_start": 1450207124,
+            "customer": "cus_7XTGlpwKwRQl8i",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
@@ -711,7 +778,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -722,13 +789,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCxKKaReE7xLUdTEFrlGVR",
-                    "customer": "cus_7VDOogGF1eEXu2",
+                    "id": "in_17IOJsKaReE7xLUd1fgS54KN",
+                    "customer": "cus_7XTGlpwKwRQl8i",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOrzrCjmPlCD",
-                                "amount": 999,
+                                "id": "sub_7XTG24R4sUTmu5",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bc"
                                 },
@@ -737,37 +804,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOrzrCjmPlCD",
-                    "total": 999
+                    "subscription": "sub_7XTG24R4sUTmu5",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCxJKaReE7xLUdD1pIcGP4",
-                    "customer": "cus_7VDOogGF1eEXu2",
+                    "id": "in_17IOJrKaReE7xLUdkBx8xDQg",
+                    "customer": "cus_7XTGlpwKwRQl8i",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDOogGF1eEXu2",
-                        "subscription": "sub_7VDOtfIZw7GnCq"
+                        "customer": "cus_7XTGlpwKwRQl8i",
+                        "subscription": "sub_7XTGbeUeeXApN3"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOtfIZw7GnCq",
-                                "amount": 999,
+                                "id": "sub_7XTGbeUeeXApN3",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bd"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -777,7 +844,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOtfIZw7GnCq",
+                    "subscription": "sub_7XTGbeUeeXApN3",
                     "total": 0
                 }
             ],
@@ -787,22 +854,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i",
         "status": 200,
         "response": {
-            "id": "cus_7VDOogGF1eEXu2",
+            "id": "cus_7XTGlpwKwRQl8i",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user126@foo.bar",
+            "email": "user26@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
                     }
                 ],
                 "has_more": false
@@ -810,11 +877,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrzrCjmPlCD",
+                        "id": "sub_7XTG24R4sUTmu5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365186,
-                        "current_period_start": 1449686786,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885524,
+                        "current_period_start": 1450207124,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
@@ -822,27 +889,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOtfIZw7GnCq",
+                        "id": "sub_7XTGbeUeeXApN3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365185,
-                        "current_period_start": 1449686785,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885523,
+                        "current_period_start": 1450207123,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOogGF1eEXu2",
-                            "subscription": "sub_7VDOtfIZw7GnCq"
+                            "customer": "cus_7XTGlpwKwRQl8i",
+                            "subscription": "sub_7XTGbeUeeXApN3"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -854,22 +921,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i",
         "status": 200,
         "response": {
-            "id": "cus_7VDOogGF1eEXu2",
+            "id": "cus_7XTGlpwKwRQl8i",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user126@foo.bar",
+            "email": "user26@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
                     }
                 ],
                 "has_more": false
@@ -877,11 +944,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrzrCjmPlCD",
+                        "id": "sub_7XTG24R4sUTmu5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365186,
-                        "current_period_start": 1449686786,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885524,
+                        "current_period_start": 1450207124,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
@@ -889,94 +956,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOtfIZw7GnCq",
+                        "id": "sub_7XTGbeUeeXApN3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365185,
-                        "current_period_start": 1449686785,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885523,
+                        "current_period_start": 1450207123,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOogGF1eEXu2",
-                            "subscription": "sub_7VDOtfIZw7GnCq"
+                            "customer": "cus_7XTGlpwKwRQl8i",
+                            "subscription": "sub_7XTGbeUeeXApN3"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDOogGF1eEXu2",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user126@foo.bar",
-            "metadata": {
-                "id": "0000000000000000000186bc"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDOrzrCjmPlCD",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365186,
-                        "current_period_start": 1449686786,
-                        "customer": "cus_7VDOogGF1eEXu2",
-                        "metadata": {
-                            "id": "0000000000000000000186bc"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDOtfIZw7GnCq",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365185,
-                        "current_period_start": 1449686785,
-                        "customer": "cus_7VDOogGF1eEXu2",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDOogGF1eEXu2",
-                            "subscription": "sub_7VDOtfIZw7GnCq"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186bd"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -988,16 +988,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxKKaReE7xLUdTEFrlGVR",
+        "path": "/v1/invoices/in_17IOJsKaReE7xLUd1fgS54KN",
         "status": 200,
         "response": {
-            "id": "in_17GCxKKaReE7xLUdTEFrlGVR",
-            "customer": "cus_7VDOogGF1eEXu2",
+            "id": "in_17IOJsKaReE7xLUd1fgS54KN",
+            "customer": "cus_7XTGlpwKwRQl8i",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOrzrCjmPlCD",
-                        "amount": 999,
+                        "id": "sub_7XTG24R4sUTmu5",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
@@ -1006,36 +1006,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOrzrCjmPlCD",
-            "total": 999
+            "subscription": "sub_7XTG24R4sUTmu5",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i",
         "status": 200,
         "response": {
-            "id": "cus_7VDOogGF1eEXu2",
+            "id": "cus_7XTGlpwKwRQl8i",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user126@foo.bar",
+            "email": "user26@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxIKaReE7xLUdoGw57NP6",
-                        "customer": "cus_7VDOogGF1eEXu2"
+                        "id": "card_17IOJpKaReE7xLUdqQSBpr4Y",
+                        "customer": "cus_7XTGlpwKwRQl8i"
                     }
                 ],
                 "has_more": false
@@ -1043,11 +1043,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrzrCjmPlCD",
+                        "id": "sub_7XTG24R4sUTmu5",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365186,
-                        "current_period_start": 1449686786,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885524,
+                        "current_period_start": 1450207124,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
@@ -1055,27 +1055,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOtfIZw7GnCq",
+                        "id": "sub_7XTGbeUeeXApN3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365185,
-                        "current_period_start": 1449686785,
-                        "customer": "cus_7VDOogGF1eEXu2",
+                        "current_period_end": 1452885523,
+                        "current_period_start": 1450207123,
+                        "customer": "cus_7XTGlpwKwRQl8i",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOogGF1eEXu2",
-                            "subscription": "sub_7VDOtfIZw7GnCq"
+                            "customer": "cus_7XTGlpwKwRQl8i",
+                            "subscription": "sub_7XTGbeUeeXApN3"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1087,29 +1087,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxJKaReE7xLUdD1pIcGP4",
+        "path": "/v1/invoices/in_17IOJrKaReE7xLUdkBx8xDQg",
         "status": 200,
         "response": {
-            "id": "in_17GCxJKaReE7xLUdD1pIcGP4",
-            "customer": "cus_7VDOogGF1eEXu2",
+            "id": "in_17IOJrKaReE7xLUdkBx8xDQg",
+            "customer": "cus_7XTGlpwKwRQl8i",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOogGF1eEXu2",
-                "subscription": "sub_7VDOtfIZw7GnCq"
+                "customer": "cus_7XTGlpwKwRQl8i",
+                "subscription": "sub_7XTGbeUeeXApN3"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOtfIZw7GnCq",
-                        "amount": 999,
+                        "id": "sub_7XTGbeUeeXApN3",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1119,21 +1119,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOtfIZw7GnCq",
+            "subscription": "sub_7XTGbeUeeXApN3",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe/subscriptions/sub_7VDONaO5dMKvmZ",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR/subscriptions/sub_7XTGPfHIGzSMTX",
         "status": 200,
         "response": {
-            "id": "sub_7VDONaO5dMKvmZ",
+            "id": "sub_7XTGPfHIGzSMTX",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365181,
-            "current_period_start": 1449686781,
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "current_period_end": 1452885517,
+            "current_period_start": 1450207117,
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
@@ -1141,28 +1141,28 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR",
         "status": 200,
         "response": {
-            "id": "cus_7VDNSO9XbQEgBe",
+            "id": "cus_7XTGhDZ4ZeZUuR",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user127@me.com",
+            "email": "user27@me.com",
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxCKaReE7xLUdtvT6QfQs",
-                        "customer": "cus_7VDNSO9XbQEgBe"
+                        "id": "card_17IOJiKaReE7xLUdv9iI4RIM",
+                        "customer": "cus_7XTGhDZ4ZeZUuR"
                     }
                 ],
                 "has_more": false
@@ -1170,11 +1170,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDONaO5dMKvmZ",
+                        "id": "sub_7XTGPfHIGzSMTX",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365181,
-                        "current_period_start": 1449686781,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885517,
+                        "current_period_start": 1450207117,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "metadata": {
                             "id": "0000000000000000000186bd"
                         },
@@ -1182,27 +1182,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDNFSXQ9g4sml",
+                        "id": "sub_7XTGDdKycYxGfB",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365179,
-                        "current_period_start": 1449686779,
-                        "customer": "cus_7VDNSO9XbQEgBe",
+                        "current_period_end": 1452885516,
+                        "current_period_start": 1450207116,
+                        "customer": "cus_7XTGhDZ4ZeZUuR",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDNSO9XbQEgBe",
-                            "subscription": "sub_7VDNFSXQ9g4sml"
+                            "customer": "cus_7XTGhDZ4ZeZUuR",
+                            "subscription": "sub_7XTGDdKycYxGfB"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1214,27 +1214,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDNSO9XbQEgBe/subscriptions/sub_7VDNFSXQ9g4sml",
+        "path": "/v1/customers/cus_7XTGhDZ4ZeZUuR/subscriptions/sub_7XTGDdKycYxGfB",
         "status": 200,
         "response": {
-            "id": "sub_7VDNFSXQ9g4sml",
+            "id": "sub_7XTGDdKycYxGfB",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365179,
-            "current_period_start": 1449686779,
-            "customer": "cus_7VDNSO9XbQEgBe",
+            "current_period_end": 1452885516,
+            "current_period_start": 1450207116,
+            "customer": "cus_7XTGhDZ4ZeZUuR",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDNSO9XbQEgBe",
-                "subscription": "sub_7VDNFSXQ9g4sml"
+                "customer": "cus_7XTGhDZ4ZeZUuR",
+                "subscription": "sub_7XTGDdKycYxGfB"
             },
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1242,14 +1242,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2/subscriptions/sub_7VDOrzrCjmPlCD",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i/subscriptions/sub_7XTG24R4sUTmu5",
         "status": 200,
         "response": {
-            "id": "sub_7VDOrzrCjmPlCD",
+            "id": "sub_7XTG24R4sUTmu5",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365186,
-            "current_period_start": 1449686786,
-            "customer": "cus_7VDOogGF1eEXu2",
+            "current_period_end": 1452885524,
+            "current_period_start": 1450207124,
+            "customer": "cus_7XTGlpwKwRQl8i",
             "metadata": {
                 "id": "0000000000000000000186bc"
             },
@@ -1257,33 +1257,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOogGF1eEXu2/subscriptions/sub_7VDOtfIZw7GnCq",
+        "path": "/v1/customers/cus_7XTGlpwKwRQl8i/subscriptions/sub_7XTGbeUeeXApN3",
         "status": 200,
         "response": {
-            "id": "sub_7VDOtfIZw7GnCq",
+            "id": "sub_7XTGbeUeeXApN3",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365185,
-            "current_period_start": 1449686785,
-            "customer": "cus_7VDOogGF1eEXu2",
+            "current_period_end": 1452885523,
+            "current_period_start": 1450207123,
+            "customer": "cus_7XTGlpwKwRQl8i",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOogGF1eEXu2",
-                "subscription": "sub_7VDOtfIZw7GnCq"
+                "customer": "cus_7XTGlpwKwRQl8i",
+                "subscription": "sub_7XTGbeUeeXApN3"
             },
             "metadata": {
                 "id": "0000000000000000000186bd"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-20.json b/spec/fixtures/sub-test-20.json
index d26971d96..05dada319 100644
--- a/spec/fixtures/sub-test-20.json
+++ b/spec/fixtures/sub-test-20.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxPKaReE7xLUdw5hQd1LV",
+            "id": "tok_17IOJyKaReE7xLUdfq3PKYZz",
             "card": {
-                "id": "card_17GCxPKaReE7xLUdYtxlCRp7"
+                "id": "card_17IOJyKaReE7xLUdZyprsEvS"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDO9FZp6WdhaH",
+            "id": "cus_7XTGP8M1yJsaoJ",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user128@me.com",
+            "email": "user28@me.com",
             "metadata": {
                 "id": "0000000000000000000186be"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxPKaReE7xLUdYtxlCRp7",
-                        "customer": "cus_7VDO9FZp6WdhaH"
+                        "id": "card_17IOJyKaReE7xLUdZyprsEvS",
+                        "customer": "cus_7XTGP8M1yJsaoJ"
                     }
                 ],
                 "has_more": false
@@ -43,70 +43,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO9FZp6WdhaH",
+        "path": "/v1/customers/cus_7XTGP8M1yJsaoJ/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDO9FZp6WdhaH",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user128@me.com",
-            "metadata": {
-                "id": "0000000000000000000186be"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxPKaReE7xLUdYtxlCRp7",
-                        "customer": "cus_7VDO9FZp6WdhaH"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO9FZp6WdhaH",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDO9FZp6WdhaH",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user128@me.com",
-            "metadata": {
-                "id": "0000000000000000000186be"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxPKaReE7xLUdYtxlCRp7",
-                        "customer": "cus_7VDO9FZp6WdhaH"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO9FZp6WdhaH/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDO0MXZq3cp9c",
+            "id": "sub_7XTGijGkWsRiRB",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365193,
-            "current_period_start": 1449686793,
-            "customer": "cus_7VDO9FZp6WdhaH",
+            "current_period_end": 1452885532,
+            "current_period_start": 1450207132,
+            "customer": "cus_7XTGP8M1yJsaoJ",
             "metadata": {
                 "id": "0000000000000000000186be"
             },
diff --git a/spec/fixtures/sub-test-21.json b/spec/fixtures/sub-test-21.json
index a5dd462eb..e250b43d6 100644
--- a/spec/fixtures/sub-test-21.json
+++ b/spec/fixtures/sub-test-21.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxSKaReE7xLUdaKID0NbQ",
+            "id": "tok_17IOK2KaReE7xLUddyVOIw8a",
             "card": {
-                "id": "card_17GCxSKaReE7xLUdTQRuQx6H"
+                "id": "card_17IOK2KaReE7xLUdfGxwfZkt"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOrDIjWzpnYf",
+            "id": "sub_7XTGNOg9TfLaOC",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365196,
-            "current_period_start": 1449686796,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885536,
+            "current_period_start": 1450207136,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -92,22 +92,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -115,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -137,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -160,17 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -205,17 +205,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -227,22 +227,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDOrDIjWzpnYf",
+                    "id": "sub_7XTGNOg9TfLaOC",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365196,
-                    "current_period_start": 1449686796,
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "current_period_end": 1452885536,
+                    "current_period_start": 1450207136,
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "metadata": {
                         "id": "0000000000000000000186c0"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -253,27 +253,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDObbSKrP0na6",
+            "id": "sub_7XTGCzA8OwHqfG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365198,
-            "current_period_start": 1449686798,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885539,
+            "current_period_start": 1450207139,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOSnaw20wvA3",
-                "subscription": "sub_7VDObbSKrP0na6"
+                "customer": "cus_7XTGHTPVjWbkDh",
+                "subscription": "sub_7XTGCzA8OwHqfG"
             },
             "metadata": {
                 "id": "0000000000000000000186bf"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -281,22 +281,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -304,39 +304,39 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDObbSKrP0na6",
+                        "id": "sub_7XTGCzA8OwHqfG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365198,
-                        "current_period_start": 1449686798,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885539,
+                        "current_period_start": 1450207139,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOSnaw20wvA3",
-                            "subscription": "sub_7VDObbSKrP0na6"
+                            "customer": "cus_7XTGHTPVjWbkDh",
+                            "subscription": "sub_7XTGCzA8OwHqfG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -348,14 +348,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOg6XvP1MgHW",
+            "id": "sub_7XTGhDi7Tv9zDj",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365200,
-            "current_period_start": 1449686800,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885540,
+            "current_period_start": 1450207140,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
@@ -363,7 +363,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
@@ -374,13 +374,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCxYKaReE7xLUd5CrgBAiB",
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "id": "in_17IOK8KaReE7xLUdHJq2Uj6k",
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOg6XvP1MgHW",
-                                "amount": 799,
+                                "id": "sub_7XTGhDi7Tv9zDj",
+                                "amount": 80,
                                 "metadata": {
                                     "id": "0000000000000000000186c0"
                                 },
@@ -389,37 +389,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 799,
+                                "quantity": 80,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOg6XvP1MgHW",
-                    "total": 799
+                    "subscription": "sub_7XTGhDi7Tv9zDj",
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCxWKaReE7xLUdNJVTUklc",
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "id": "in_17IOK7KaReE7xLUdZiAHtzvt",
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDOSnaw20wvA3",
-                        "subscription": "sub_7VDObbSKrP0na6"
+                        "customer": "cus_7XTGHTPVjWbkDh",
+                        "subscription": "sub_7XTGCzA8OwHqfG"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDObbSKrP0na6",
-                                "amount": 999,
+                                "id": "sub_7XTGCzA8OwHqfG",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186bf"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -429,23 +429,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDObbSKrP0na6",
+                    "subscription": "sub_7XTGCzA8OwHqfG",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCxUKaReE7xLUdYb801cDu",
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "id": "in_17IOK4KaReE7xLUdb2yxMYpd",
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOrDIjWzpnYf",
-                                "amount": 999,
+                                "id": "sub_7XTGNOg9TfLaOC",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c0"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -455,8 +455,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOrDIjWzpnYf",
-                    "total": 999
+                    "subscription": "sub_7XTGNOg9TfLaOC",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -465,22 +465,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -488,11 +488,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOg6XvP1MgHW",
+                        "id": "sub_7XTGhDi7Tv9zDj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365200,
-                        "current_period_start": 1449686800,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885540,
+                        "current_period_start": 1450207140,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
@@ -500,42 +500,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDObbSKrP0na6",
+                        "id": "sub_7XTGCzA8OwHqfG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365198,
-                        "current_period_start": 1449686798,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885539,
+                        "current_period_start": 1450207139,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOSnaw20wvA3",
-                            "subscription": "sub_7VDObbSKrP0na6"
+                            "customer": "cus_7XTGHTPVjWbkDh",
+                            "subscription": "sub_7XTGCzA8OwHqfG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -547,22 +547,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -570,11 +570,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOg6XvP1MgHW",
+                        "id": "sub_7XTGhDi7Tv9zDj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365200,
-                        "current_period_start": 1449686800,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885540,
+                        "current_period_start": 1450207140,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
@@ -582,42 +582,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDObbSKrP0na6",
+                        "id": "sub_7XTGCzA8OwHqfG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365198,
-                        "current_period_start": 1449686798,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885539,
+                        "current_period_start": 1450207139,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOSnaw20wvA3",
-                            "subscription": "sub_7VDObbSKrP0na6"
+                            "customer": "cus_7XTGHTPVjWbkDh",
+                            "subscription": "sub_7XTGCzA8OwHqfG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -629,16 +629,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxYKaReE7xLUd5CrgBAiB",
+        "path": "/v1/invoices/in_17IOK8KaReE7xLUdHJq2Uj6k",
         "status": 200,
         "response": {
-            "id": "in_17GCxYKaReE7xLUd5CrgBAiB",
-            "customer": "cus_7VDOSnaw20wvA3",
+            "id": "in_17IOK8KaReE7xLUdHJq2Uj6k",
+            "customer": "cus_7XTGHTPVjWbkDh",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOg6XvP1MgHW",
-                        "amount": 799,
+                        "id": "sub_7XTGhDi7Tv9zDj",
+                        "amount": 80,
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
@@ -647,36 +647,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 799,
+                        "quantity": 80,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOg6XvP1MgHW",
-            "total": 799
+            "subscription": "sub_7XTGhDi7Tv9zDj",
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -684,11 +684,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOg6XvP1MgHW",
+                        "id": "sub_7XTGhDi7Tv9zDj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365200,
-                        "current_period_start": 1449686800,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885540,
+                        "current_period_start": 1450207140,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
@@ -696,42 +696,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDObbSKrP0na6",
+                        "id": "sub_7XTGCzA8OwHqfG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365198,
-                        "current_period_start": 1449686798,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885539,
+                        "current_period_start": 1450207139,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOSnaw20wvA3",
-                            "subscription": "sub_7VDObbSKrP0na6"
+                            "customer": "cus_7XTGHTPVjWbkDh",
+                            "subscription": "sub_7XTGCzA8OwHqfG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -743,29 +743,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxWKaReE7xLUdNJVTUklc",
+        "path": "/v1/invoices/in_17IOK7KaReE7xLUdZiAHtzvt",
         "status": 200,
         "response": {
-            "id": "in_17GCxWKaReE7xLUdNJVTUklc",
-            "customer": "cus_7VDOSnaw20wvA3",
+            "id": "in_17IOK7KaReE7xLUdZiAHtzvt",
+            "customer": "cus_7XTGHTPVjWbkDh",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOSnaw20wvA3",
-                "subscription": "sub_7VDObbSKrP0na6"
+                "customer": "cus_7XTGHTPVjWbkDh",
+                "subscription": "sub_7XTGCzA8OwHqfG"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDObbSKrP0na6",
-                        "amount": 999,
+                        "id": "sub_7XTGCzA8OwHqfG",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -775,29 +775,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDObbSKrP0na6",
+            "subscription": "sub_7XTGCzA8OwHqfG",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxUKaReE7xLUdYb801cDu",
+        "path": "/v1/invoices/in_17IOK4KaReE7xLUdb2yxMYpd",
         "status": 200,
         "response": {
-            "id": "in_17GCxUKaReE7xLUdYb801cDu",
-            "customer": "cus_7VDOSnaw20wvA3",
+            "id": "in_17IOK4KaReE7xLUdb2yxMYpd",
+            "customer": "cus_7XTGHTPVjWbkDh",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
-                        "amount": 999,
+                        "id": "sub_7XTGNOg9TfLaOC",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -807,34 +807,34 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOrDIjWzpnYf",
-            "total": 999
+            "subscription": "sub_7XTGNOg9TfLaOC",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions/sub_7VDObbSKrP0na6",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions/sub_7XTGCzA8OwHqfG",
         "status": 200,
         "response": {
-            "id": "sub_7VDObbSKrP0na6",
+            "id": "sub_7XTGCzA8OwHqfG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365198,
-            "current_period_start": 1449686798,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885539,
+            "current_period_start": 1450207139,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOSnaw20wvA3",
-                "subscription": "sub_7VDObbSKrP0na6"
+                "customer": "cus_7XTGHTPVjWbkDh",
+                "subscription": "sub_7XTGCzA8OwHqfG"
             },
             "metadata": {
                 "id": "0000000000000000000186bf"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -842,22 +842,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh",
         "status": 200,
         "response": {
-            "id": "cus_7VDOSnaw20wvA3",
+            "id": "cus_7XTGHTPVjWbkDh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user130@me.com",
+            "email": "user30@me.com",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxSKaReE7xLUdTQRuQx6H",
-                        "customer": "cus_7VDOSnaw20wvA3"
+                        "id": "card_17IOK2KaReE7xLUdfGxwfZkt",
+                        "customer": "cus_7XTGHTPVjWbkDh"
                     }
                 ],
                 "has_more": false
@@ -865,11 +865,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOg6XvP1MgHW",
+                        "id": "sub_7XTGhDi7Tv9zDj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365200,
-                        "current_period_start": 1449686800,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885540,
+                        "current_period_start": 1450207140,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
@@ -877,42 +877,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDObbSKrP0na6",
+                        "id": "sub_7XTGCzA8OwHqfG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365198,
-                        "current_period_start": 1449686798,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885539,
+                        "current_period_start": 1450207139,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOSnaw20wvA3",
-                            "subscription": "sub_7VDObbSKrP0na6"
+                            "customer": "cus_7XTGHTPVjWbkDh",
+                            "subscription": "sub_7XTGCzA8OwHqfG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186bf"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOrDIjWzpnYf",
+                        "id": "sub_7XTGNOg9TfLaOC",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365196,
-                        "current_period_start": 1449686796,
-                        "customer": "cus_7VDOSnaw20wvA3",
+                        "current_period_end": 1452885536,
+                        "current_period_start": 1450207136,
+                        "customer": "cus_7XTGHTPVjWbkDh",
                         "metadata": {
                             "id": "0000000000000000000186c0"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -924,27 +924,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions/sub_7VDObbSKrP0na6",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions/sub_7XTGCzA8OwHqfG",
         "status": 200,
         "response": {
-            "id": "sub_7VDObbSKrP0na6",
+            "id": "sub_7XTGCzA8OwHqfG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365198,
-            "current_period_start": 1449686798,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885539,
+            "current_period_start": 1450207139,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOSnaw20wvA3",
-                "subscription": "sub_7VDObbSKrP0na6"
+                "customer": "cus_7XTGHTPVjWbkDh",
+                "subscription": "sub_7XTGCzA8OwHqfG"
             },
             "metadata": {
                 "id": "0000000000000000000186bf"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -952,14 +952,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions/sub_7VDOg6XvP1MgHW",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions/sub_7XTGhDi7Tv9zDj",
         "status": 200,
         "response": {
-            "id": "sub_7VDOg6XvP1MgHW",
+            "id": "sub_7XTGhDi7Tv9zDj",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365200,
-            "current_period_start": 1449686800,
-            "customer": "cus_7VDOSnaw20wvA3",
+            "current_period_end": 1452885540,
+            "current_period_start": 1450207140,
+            "customer": "cus_7XTGHTPVjWbkDh",
             "metadata": {
                 "id": "0000000000000000000186c0"
             },
@@ -973,16 +973,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOSnaw20wvA3/subscriptions",
+        "path": "/v1/customers/cus_7XTGHTPVjWbkDh/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDOg6XvP1MgHW",
+                    "id": "sub_7XTGhDi7Tv9zDj",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365200,
-                    "current_period_start": 1449686800,
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "current_period_end": 1452885540,
+                    "current_period_start": 1450207140,
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "metadata": {
                         "id": "0000000000000000000186c0"
                     },
@@ -993,17 +993,17 @@
                     "quantity": 0
                 },
                 {
-                    "id": "sub_7VDOrDIjWzpnYf",
+                    "id": "sub_7XTGNOg9TfLaOC",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365196,
-                    "current_period_start": 1449686796,
-                    "customer": "cus_7VDOSnaw20wvA3",
+                    "current_period_end": 1452885536,
+                    "current_period_start": 1450207136,
+                    "customer": "cus_7XTGHTPVjWbkDh",
                     "metadata": {
                         "id": "0000000000000000000186c0"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
diff --git a/spec/fixtures/sub-test-22.json b/spec/fixtures/sub-test-22.json
index db4b28bae..0c15b2ad5 100644
--- a/spec/fixtures/sub-test-22.json
+++ b/spec/fixtures/sub-test-22.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxgKaReE7xLUdej24ioXL",
+            "id": "tok_17IOKGKaReE7xLUdY5Kh6nB0",
             "card": {
-                "id": "card_17GCxgKaReE7xLUdKVqLosSk"
+                "id": "card_17IOKGKaReE7xLUdrZaSiIhD"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOvquFDIoefy",
+            "id": "sub_7XTGSR4bH06s6T",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365209,
-            "current_period_start": 1449686809,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885550,
+            "current_period_start": 1450207150,
+            "customer": "cus_7XTG3jr6z81u6C",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -92,22 +92,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -115,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -137,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -160,17 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDOvquFDIoefy",
+                    "id": "sub_7XTGSR4bH06s6T",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365209,
-                    "current_period_start": 1449686809,
-                    "customer": "cus_7VDO6Xjdz3Jc8z",
+                    "current_period_end": 1452885550,
+                    "current_period_start": 1450207150,
+                    "customer": "cus_7XTG3jr6z81u6C",
                     "metadata": {
                         "id": "0000000000000000000186c2"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -208,22 +208,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -231,17 +231,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -253,27 +253,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOhgNQVi8nqk",
+            "id": "sub_7XTGakYuzBX1CO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365211,
-            "current_period_start": 1449686811,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885552,
+            "current_period_start": 1450207152,
+            "customer": "cus_7XTG3jr6z81u6C",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDO6Xjdz3Jc8z",
-                "subscription": "sub_7VDOhgNQVi8nqk"
+                "customer": "cus_7XTG3jr6z81u6C",
+                "subscription": "sub_7XTGakYuzBX1CO"
             },
             "metadata": {
                 "id": "0000000000000000000186c1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -281,14 +281,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOtuoXfZjxqR",
+            "id": "sub_7XTGIZ4JCYkRY6",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365213,
-            "current_period_start": 1449686813,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885553,
+            "current_period_start": 1450207153,
+            "customer": "cus_7XTG3jr6z81u6C",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
@@ -296,7 +296,89 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTG3jr6z81u6C",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user32@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c2"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTGIZ4JCYkRY6",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "metadata": {
+                            "id": "0000000000000000000186c2"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTGakYuzBX1CO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c1"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTGSR4bH06s6T",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "metadata": {
+                            "id": "0000000000000000000186c2"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -307,13 +389,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCxlKaReE7xLUdw3fG5lv1",
-                    "customer": "cus_7VDO6Xjdz3Jc8z",
+                    "id": "in_17IOKLKaReE7xLUds4GY1CfP",
+                    "customer": "cus_7XTG3jr6z81u6C",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOtuoXfZjxqR",
-                                "amount": 799,
+                                "id": "sub_7XTGIZ4JCYkRY6",
+                                "amount": 80,
                                 "metadata": {
                                     "id": "0000000000000000000186c2"
                                 },
@@ -322,37 +404,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 799,
+                                "quantity": 80,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOtuoXfZjxqR",
-                    "total": 799
+                    "subscription": "sub_7XTGIZ4JCYkRY6",
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCxjKaReE7xLUdGGPyBy7K",
-                    "customer": "cus_7VDO6Xjdz3Jc8z",
+                    "id": "in_17IOKKKaReE7xLUdCUFFxC8A",
+                    "customer": "cus_7XTG3jr6z81u6C",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "subscription": "sub_7VDOhgNQVi8nqk"
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "subscription": "sub_7XTGakYuzBX1CO"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOhgNQVi8nqk",
-                                "amount": 999,
+                                "id": "sub_7XTGakYuzBX1CO",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c1"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -362,23 +444,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOhgNQVi8nqk",
+                    "subscription": "sub_7XTGakYuzBX1CO",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCxhKaReE7xLUdldrUK2ns",
-                    "customer": "cus_7VDO6Xjdz3Jc8z",
+                    "id": "in_17IOKIKaReE7xLUdNd359asN",
+                    "customer": "cus_7XTG3jr6z81u6C",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOvquFDIoefy",
-                                "amount": 999,
+                                "id": "sub_7XTGSR4bH06s6T",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c2"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -388,8 +470,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOvquFDIoefy",
-                    "total": 999
+                    "subscription": "sub_7XTGSR4bH06s6T",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -398,22 +480,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -421,11 +503,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
+                        "id": "sub_7XTGIZ4JCYkRY6",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -433,42 +515,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
+                        "id": "sub_7XTGakYuzBX1CO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -480,16 +562,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxlKaReE7xLUdw3fG5lv1",
+        "path": "/v1/invoices/in_17IOKLKaReE7xLUds4GY1CfP",
         "status": 200,
         "response": {
-            "id": "in_17GCxlKaReE7xLUdw3fG5lv1",
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "id": "in_17IOKLKaReE7xLUds4GY1CfP",
+            "customer": "cus_7XTG3jr6z81u6C",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
-                        "amount": 799,
+                        "id": "sub_7XTGIZ4JCYkRY6",
+                        "amount": 80,
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -498,36 +580,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 799,
+                        "quantity": 80,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOtuoXfZjxqR",
-            "total": 799
+            "subscription": "sub_7XTGIZ4JCYkRY6",
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -535,11 +617,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
+                        "id": "sub_7XTGIZ4JCYkRY6",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -547,42 +629,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
+                        "id": "sub_7XTGakYuzBX1CO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -594,22 +676,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -617,11 +699,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
+                        "id": "sub_7XTGIZ4JCYkRY6",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -629,42 +711,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
+                        "id": "sub_7XTGakYuzBX1CO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -676,29 +758,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxjKaReE7xLUdGGPyBy7K",
+        "path": "/v1/invoices/in_17IOKKKaReE7xLUdCUFFxC8A",
         "status": 200,
         "response": {
-            "id": "in_17GCxjKaReE7xLUdGGPyBy7K",
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "id": "in_17IOKKKaReE7xLUdCUFFxC8A",
+            "customer": "cus_7XTG3jr6z81u6C",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDO6Xjdz3Jc8z",
-                "subscription": "sub_7VDOhgNQVi8nqk"
+                "customer": "cus_7XTG3jr6z81u6C",
+                "subscription": "sub_7XTGakYuzBX1CO"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
-                        "amount": 999,
+                        "id": "sub_7XTGakYuzBX1CO",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -708,29 +790,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOhgNQVi8nqk",
+            "subscription": "sub_7XTGakYuzBX1CO",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxhKaReE7xLUdldrUK2ns",
+        "path": "/v1/invoices/in_17IOKIKaReE7xLUdNd359asN",
         "status": 200,
         "response": {
-            "id": "in_17GCxhKaReE7xLUdldrUK2ns",
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "id": "in_17IOKIKaReE7xLUdNd359asN",
+            "customer": "cus_7XTG3jr6z81u6C",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOvquFDIoefy",
-                        "amount": 999,
+                        "id": "sub_7XTGSR4bH06s6T",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -740,176 +822,27 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOvquFDIoefy",
-            "total": 999
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user132@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c2"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDOtuoXfZjxqR",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "metadata": {
-                            "id": "0000000000000000000186c2"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 799
-                    },
-                    {
-                        "id": "sub_7VDOhgNQVi8nqk",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDOvquFDIoefy",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "metadata": {
-                            "id": "0000000000000000000186c2"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user132@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c2"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDOhgNQVi8nqk",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDOvquFDIoefy",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
-                        "metadata": {
-                            "id": "0000000000000000000186c2"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "subscription": "sub_7XTGSR4bH06s6T",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions/sub_7VDOvquFDIoefy",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions/sub_7XTGSR4bH06s6T",
         "status": 200,
         "response": {
-            "id": "sub_7VDOvquFDIoefy",
+            "id": "sub_7XTGSR4bH06s6T",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365209,
-            "current_period_start": 1449686809,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885550,
+            "current_period_start": 1450207150,
+            "customer": "cus_7XTG3jr6z81u6C",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -917,22 +850,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -940,11 +873,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
+                        "id": "sub_7XTGIZ4JCYkRY6",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -952,42 +885,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
+                        "id": "sub_7XTGakYuzBX1CO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -999,20 +932,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions/sub_7VDOvquFDIoefy",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions/sub_7XTGSR4bH06s6T",
         "status": 200,
         "response": {
-            "id": "sub_7VDOvquFDIoefy",
+            "id": "sub_7XTGSR4bH06s6T",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365209,
-            "current_period_start": 1449686809,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885550,
+            "current_period_start": 1450207150,
+            "customer": "cus_7XTG3jr6z81u6C",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1020,22 +953,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
         "status": 200,
         "response": {
-            "id": "cus_7VDO6Xjdz3Jc8z",
+            "id": "cus_7XTG3jr6z81u6C",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user132@me.com",
+            "email": "user32@me.com",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxgKaReE7xLUdKVqLosSk",
-                        "customer": "cus_7VDO6Xjdz3Jc8z"
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
                     }
                 ],
                 "has_more": false
@@ -1043,11 +976,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOtuoXfZjxqR",
+                        "id": "sub_7XTGIZ4JCYkRY6",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365213,
-                        "current_period_start": 1449686813,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
@@ -1055,42 +988,124 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDOhgNQVi8nqk",
+                        "id": "sub_7XTGakYuzBX1CO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365211,
-                        "current_period_start": 1449686811,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO6Xjdz3Jc8z",
-                            "subscription": "sub_7VDOhgNQVi8nqk"
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDOvquFDIoefy",
+                        "id": "sub_7XTGSR4bH06s6T",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365209,
-                        "current_period_start": 1449686809,
-                        "customer": "cus_7VDO6Xjdz3Jc8z",
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
                         "metadata": {
                             "id": "0000000000000000000186c2"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTG3jr6z81u6C",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user32@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c2"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKGKaReE7xLUdrZaSiIhD",
+                        "customer": "cus_7XTG3jr6z81u6C"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTGIZ4JCYkRY6",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885553,
+                        "current_period_start": 1450207153,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "metadata": {
+                            "id": "0000000000000000000186c2"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTGakYuzBX1CO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885552,
+                        "current_period_start": 1450207152,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTG3jr6z81u6C",
+                            "subscription": "sub_7XTGakYuzBX1CO"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c1"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTGSR4bH06s6T",
+                        "cancel_at_period_end": true,
+                        "current_period_end": 1452885550,
+                        "current_period_start": 1450207150,
+                        "customer": "cus_7XTG3jr6z81u6C",
+                        "metadata": {
+                            "id": "0000000000000000000186c2"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1102,14 +1117,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions/sub_7VDOtuoXfZjxqR",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions/sub_7XTGIZ4JCYkRY6",
         "status": 200,
         "response": {
-            "id": "sub_7VDOtuoXfZjxqR",
+            "id": "sub_7XTGIZ4JCYkRY6",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365213,
-            "current_period_start": 1449686813,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885553,
+            "current_period_start": 1450207153,
+            "customer": "cus_7XTG3jr6z81u6C",
             "metadata": {
                 "id": "0000000000000000000186c2"
             },
@@ -1117,33 +1132,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO6Xjdz3Jc8z/subscriptions/sub_7VDOhgNQVi8nqk",
+        "path": "/v1/customers/cus_7XTG3jr6z81u6C/subscriptions/sub_7XTGakYuzBX1CO",
         "status": 200,
         "response": {
-            "id": "sub_7VDOhgNQVi8nqk",
+            "id": "sub_7XTGakYuzBX1CO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365211,
-            "current_period_start": 1449686811,
-            "customer": "cus_7VDO6Xjdz3Jc8z",
+            "current_period_end": 1452885552,
+            "current_period_start": 1450207152,
+            "customer": "cus_7XTG3jr6z81u6C",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDO6Xjdz3Jc8z",
-                "subscription": "sub_7VDOhgNQVi8nqk"
+                "customer": "cus_7XTG3jr6z81u6C",
+                "subscription": "sub_7XTGakYuzBX1CO"
             },
             "metadata": {
                 "id": "0000000000000000000186c1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-23.json b/spec/fixtures/sub-test-23.json
index 63f01eb05..5ceb240ad 100644
--- a/spec/fixtures/sub-test-23.json
+++ b/spec/fixtures/sub-test-23.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCxvKaReE7xLUdEV9eAvts",
+            "id": "tok_17IOKTKaReE7xLUdUKQThR44",
             "card": {
-                "id": "card_17GCxvKaReE7xLUd6Z6925wK"
+                "id": "card_17IOKTKaReE7xLUdPKJBGiyU"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
+            "id": "cus_7XTH3kIfN3qg6R",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user134@me.com",
+            "email": "user34@me.com",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user134@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c4"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5/subscriptions",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +52,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5/subscriptions",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R",
         "status": 200,
         "response": {
-            "id": "sub_7VDOz93nZ10dgt",
+            "id": "cus_7XTH3kIfN3qg6R",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user34@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c4"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTH2H3bvq1CWt",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365225,
-            "current_period_start": 1449686825,
-            "customer": "cus_7VDOpSn6vZJJy5",
+            "current_period_end": 1452885562,
+            "current_period_start": 1450207162,
+            "customer": "cus_7XTH3kIfN3qg6R",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOpSn6vZJJy5",
-                "subscription": "sub_7VDOz93nZ10dgt"
+                "customer": "cus_7XTH3kIfN3qg6R",
+                "subscription": "sub_7XTH2H3bvq1CWt"
             },
             "metadata": {
                 "id": "0000000000000000000186c3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R",
         "status": 200,
         "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
+            "id": "cus_7XTH3kIfN3qg6R",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user134@me.com",
+            "email": "user34@me.com",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOz93nZ10dgt",
+                        "id": "sub_7XTH2H3bvq1CWt",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365225,
-                        "current_period_start": 1449686825,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885562,
+                        "current_period_start": 1450207162,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOpSn6vZJJy5",
-                            "subscription": "sub_7VDOz93nZ10dgt"
+                            "customer": "cus_7XTH3kIfN3qg6R",
+                            "subscription": "sub_7XTH2H3bvq1CWt"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5/subscriptions",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOnhT4PweQKC",
+            "id": "sub_7XTHyTRUbLxWLh",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365227,
-            "current_period_start": 1449686827,
-            "customer": "cus_7VDOpSn6vZJJy5",
+            "current_period_end": 1452885564,
+            "current_period_start": 1450207164,
+            "customer": "cus_7XTH3kIfN3qg6R",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
@@ -175,7 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCxzKaReE7xLUdRK7KpPjM",
-                    "customer": "cus_7VDOpSn6vZJJy5",
+                    "id": "in_17IOKWKaReE7xLUdEzScclhh",
+                    "customer": "cus_7XTH3kIfN3qg6R",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOnhT4PweQKC",
-                                "amount": 999,
+                                "id": "sub_7XTHyTRUbLxWLh",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c4"
                                 },
@@ -201,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOnhT4PweQKC",
-                    "total": 999
+                    "subscription": "sub_7XTHyTRUbLxWLh",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCxxKaReE7xLUdo8Qz7BPX",
-                    "customer": "cus_7VDOpSn6vZJJy5",
+                    "id": "in_17IOKUKaReE7xLUdZUxxEaPp",
+                    "customer": "cus_7XTH3kIfN3qg6R",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDOpSn6vZJJy5",
-                        "subscription": "sub_7VDOz93nZ10dgt"
+                        "customer": "cus_7XTH3kIfN3qg6R",
+                        "subscription": "sub_7XTH2H3bvq1CWt"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOz93nZ10dgt",
-                                "amount": 999,
+                                "id": "sub_7XTH2H3bvq1CWt",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c3"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOz93nZ10dgt",
+                    "subscription": "sub_7XTH2H3bvq1CWt",
                     "total": 0
                 }
             ],
@@ -251,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R",
         "status": 200,
         "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
+            "id": "cus_7XTH3kIfN3qg6R",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user134@me.com",
+            "email": "user34@me.com",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
                     }
                 ],
                 "has_more": false
@@ -274,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOnhT4PweQKC",
+                        "id": "sub_7XTHyTRUbLxWLh",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365227,
-                        "current_period_start": 1449686827,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885564,
+                        "current_period_start": 1450207164,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "metadata": {
                             "id": "0000000000000000000186c4"
                         },
@@ -286,27 +286,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOz93nZ10dgt",
+                        "id": "sub_7XTH2H3bvq1CWt",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365225,
-                        "current_period_start": 1449686825,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885562,
+                        "current_period_start": 1450207162,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOpSn6vZJJy5",
-                            "subscription": "sub_7VDOz93nZ10dgt"
+                            "customer": "cus_7XTH3kIfN3qg6R",
+                            "subscription": "sub_7XTH2H3bvq1CWt"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,22 +318,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R",
         "status": 200,
         "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
+            "id": "cus_7XTH3kIfN3qg6R",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user134@me.com",
+            "email": "user34@me.com",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
                     }
                 ],
                 "has_more": false
@@ -341,11 +341,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOnhT4PweQKC",
+                        "id": "sub_7XTHyTRUbLxWLh",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365227,
-                        "current_period_start": 1449686827,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885564,
+                        "current_period_start": 1450207164,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "metadata": {
                             "id": "0000000000000000000186c4"
                         },
@@ -353,27 +353,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOz93nZ10dgt",
+                        "id": "sub_7XTH2H3bvq1CWt",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365225,
-                        "current_period_start": 1449686825,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885562,
+                        "current_period_start": 1450207162,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOpSn6vZJJy5",
-                            "subscription": "sub_7VDOz93nZ10dgt"
+                            "customer": "cus_7XTH3kIfN3qg6R",
+                            "subscription": "sub_7XTH2H3bvq1CWt"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -385,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxzKaReE7xLUdRK7KpPjM",
+        "path": "/v1/invoices/in_17IOKWKaReE7xLUdEzScclhh",
         "status": 200,
         "response": {
-            "id": "in_17GCxzKaReE7xLUdRK7KpPjM",
-            "customer": "cus_7VDOpSn6vZJJy5",
+            "id": "in_17IOKWKaReE7xLUdEzScclhh",
+            "customer": "cus_7XTH3kIfN3qg6R",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOnhT4PweQKC",
-                        "amount": 999,
+                        "id": "sub_7XTHyTRUbLxWLh",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c4"
                         },
@@ -403,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOnhT4PweQKC",
-            "total": 999
+            "subscription": "sub_7XTHyTRUbLxWLh",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDOpSn6vZJJy5",
+        "path": "/v1/customers/cus_7XTH3kIfN3qg6R",
         "status": 200,
         "response": {
-            "id": "cus_7VDOpSn6vZJJy5",
+            "id": "cus_7XTH3kIfN3qg6R",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user134@me.com",
+            "email": "user34@me.com",
             "metadata": {
                 "id": "0000000000000000000186c4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCxvKaReE7xLUd6Z6925wK",
-                        "customer": "cus_7VDOpSn6vZJJy5"
+                        "id": "card_17IOKTKaReE7xLUdPKJBGiyU",
+                        "customer": "cus_7XTH3kIfN3qg6R"
                     }
                 ],
                 "has_more": false
@@ -440,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOnhT4PweQKC",
+                        "id": "sub_7XTHyTRUbLxWLh",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365227,
-                        "current_period_start": 1449686827,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885564,
+                        "current_period_start": 1450207164,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "metadata": {
                             "id": "0000000000000000000186c4"
                         },
@@ -452,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOz93nZ10dgt",
+                        "id": "sub_7XTH2H3bvq1CWt",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365225,
-                        "current_period_start": 1449686825,
-                        "customer": "cus_7VDOpSn6vZJJy5",
+                        "current_period_end": 1452885562,
+                        "current_period_start": 1450207162,
+                        "customer": "cus_7XTH3kIfN3qg6R",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDOpSn6vZJJy5",
-                            "subscription": "sub_7VDOz93nZ10dgt"
+                            "customer": "cus_7XTH3kIfN3qg6R",
+                            "subscription": "sub_7XTH2H3bvq1CWt"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -484,29 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCxxKaReE7xLUdo8Qz7BPX",
+        "path": "/v1/invoices/in_17IOKUKaReE7xLUdZUxxEaPp",
         "status": 200,
         "response": {
-            "id": "in_17GCxxKaReE7xLUdo8Qz7BPX",
-            "customer": "cus_7VDOpSn6vZJJy5",
+            "id": "in_17IOKUKaReE7xLUdZUxxEaPp",
+            "customer": "cus_7XTH3kIfN3qg6R",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDOpSn6vZJJy5",
-                "subscription": "sub_7VDOz93nZ10dgt"
+                "customer": "cus_7XTH3kIfN3qg6R",
+                "subscription": "sub_7XTH2H3bvq1CWt"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOz93nZ10dgt",
-                        "amount": 999,
+                        "id": "sub_7XTH2H3bvq1CWt",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,7 +516,7 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOz93nZ10dgt",
+            "subscription": "sub_7XTH2H3bvq1CWt",
             "total": 0
         }
     },
@@ -526,9 +526,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCy2KaReE7xLUdOlFDclfi",
+            "id": "tok_17IOKaKaReE7xLUd4AGn2rgy",
             "card": {
-                "id": "card_17GCy2KaReE7xLUdn5BsBWRl"
+                "id": "card_17IOKaKaReE7xLUdhdRsO2Rd"
             },
             "type": "card"
         }
@@ -539,19 +539,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDObWSh1dlYh7",
+            "id": "cus_7XTHoggYpPzYR3",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user133@foo.bar",
+            "email": "user33@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186c3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCy2KaReE7xLUdn5BsBWRl",
-                        "customer": "cus_7VDObWSh1dlYh7"
+                        "id": "card_17IOKaKaReE7xLUdhdRsO2Rd",
+                        "customer": "cus_7XTHoggYpPzYR3"
                     }
                 ],
                 "has_more": false
diff --git a/spec/fixtures/sub-test-24.json b/spec/fixtures/sub-test-24.json
index 65b84a11b..338282cc3 100644
--- a/spec/fixtures/sub-test-24.json
+++ b/spec/fixtures/sub-test-24.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCy3KaReE7xLUdtYb2OjrY",
+            "id": "tok_17IOKbKaReE7xLUdspGOMyyT",
             "card": {
-                "id": "card_17GCy3KaReE7xLUd3P9sxPX6"
+                "id": "card_17IOKbKaReE7xLUdrhYtxEyz"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
+            "id": "cus_7XTH5KpXyx6sz0",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user136@me.com",
+            "email": "user36@me.com",
             "metadata": {
                 "id": "0000000000000000000186c6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user136@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c6"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV/subscriptions",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +52,55 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV/subscriptions",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0",
         "status": 200,
         "response": {
-            "id": "sub_7VDOI7IgrnOnfU",
+            "id": "cus_7XTH5KpXyx6sz0",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user36@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c6"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTHaQNo0KytMD",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365233,
-            "current_period_start": 1449686833,
-            "customer": "cus_7VDO2rAKGoRyuV",
+            "current_period_end": 1452885571,
+            "current_period_start": 1450207171,
+            "customer": "cus_7XTH5KpXyx6sz0",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDO2rAKGoRyuV",
-                "subscription": "sub_7VDOI7IgrnOnfU"
+                "customer": "cus_7XTH5KpXyx6sz0",
+                "subscription": "sub_7XTHaQNo0KytMD"
             },
             "metadata": {
                 "id": "0000000000000000000186c5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0",
         "status": 200,
         "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
+            "id": "cus_7XTH5KpXyx6sz0",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user136@me.com",
+            "email": "user36@me.com",
             "metadata": {
                 "id": "0000000000000000000186c6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOI7IgrnOnfU",
+                        "id": "sub_7XTHaQNo0KytMD",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365233,
-                        "current_period_start": 1449686833,
-                        "customer": "cus_7VDO2rAKGoRyuV",
+                        "current_period_end": 1452885571,
+                        "current_period_start": 1450207171,
+                        "customer": "cus_7XTH5KpXyx6sz0",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO2rAKGoRyuV",
-                            "subscription": "sub_7VDOI7IgrnOnfU"
+                            "customer": "cus_7XTH5KpXyx6sz0",
+                            "subscription": "sub_7XTHaQNo0KytMD"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV/subscriptions",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDOArVVxBdO8Z",
+            "id": "sub_7XTH6Es3n9Txpd",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365235,
-            "current_period_start": 1449686835,
-            "customer": "cus_7VDO2rAKGoRyuV",
+            "current_period_end": 1452885573,
+            "current_period_start": 1450207173,
+            "customer": "cus_7XTH5KpXyx6sz0",
             "metadata": {
                 "id": "0000000000000000000186c6"
             },
@@ -175,74 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user136@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c6"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDOArVVxBdO8Z",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365235,
-                        "current_period_start": 1449686835,
-                        "customer": "cus_7VDO2rAKGoRyuV",
-                        "metadata": {
-                            "id": "0000000000000000000186c6"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDOI7IgrnOnfU",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365233,
-                        "current_period_start": 1449686833,
-                        "customer": "cus_7VDO2rAKGoRyuV",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDO2rAKGoRyuV",
-                            "subscription": "sub_7VDOI7IgrnOnfU"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c5"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "quantity": 100
         }
     },
     {
@@ -253,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCy7KaReE7xLUdan3pUgPg",
-                    "customer": "cus_7VDO2rAKGoRyuV",
+                    "id": "in_17IOKfKaReE7xLUdbPWU9fmO",
+                    "customer": "cus_7XTH5KpXyx6sz0",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOArVVxBdO8Z",
-                                "amount": 999,
+                                "id": "sub_7XTH6Es3n9Txpd",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c6"
                                 },
@@ -268,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOArVVxBdO8Z",
-                    "total": 999
+                    "subscription": "sub_7XTH6Es3n9Txpd",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCy5KaReE7xLUdWfZT15jA",
-                    "customer": "cus_7VDO2rAKGoRyuV",
+                    "id": "in_17IOKdKaReE7xLUdThjKzrft",
+                    "customer": "cus_7XTH5KpXyx6sz0",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDO2rAKGoRyuV",
-                        "subscription": "sub_7VDOI7IgrnOnfU"
+                        "customer": "cus_7XTH5KpXyx6sz0",
+                        "subscription": "sub_7XTHaQNo0KytMD"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDOI7IgrnOnfU",
-                                "amount": 999,
+                                "id": "sub_7XTHaQNo0KytMD",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c5"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -308,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDOI7IgrnOnfU",
+                    "subscription": "sub_7XTHaQNo0KytMD",
                     "total": 0
                 }
             ],
@@ -318,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0",
         "status": 200,
         "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
+            "id": "cus_7XTH5KpXyx6sz0",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user136@me.com",
+            "email": "user36@me.com",
             "metadata": {
                 "id": "0000000000000000000186c6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
                     }
                 ],
                 "has_more": false
@@ -341,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOArVVxBdO8Z",
+                        "id": "sub_7XTH6Es3n9Txpd",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365235,
-                        "current_period_start": 1449686835,
-                        "customer": "cus_7VDO2rAKGoRyuV",
+                        "current_period_end": 1452885573,
+                        "current_period_start": 1450207173,
+                        "customer": "cus_7XTH5KpXyx6sz0",
                         "metadata": {
                             "id": "0000000000000000000186c6"
                         },
@@ -353,27 +286,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOI7IgrnOnfU",
+                        "id": "sub_7XTHaQNo0KytMD",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365233,
-                        "current_period_start": 1449686833,
-                        "customer": "cus_7VDO2rAKGoRyuV",
+                        "current_period_end": 1452885571,
+                        "current_period_start": 1450207171,
+                        "customer": "cus_7XTH5KpXyx6sz0",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO2rAKGoRyuV",
-                            "subscription": "sub_7VDOI7IgrnOnfU"
+                            "customer": "cus_7XTH5KpXyx6sz0",
+                            "subscription": "sub_7XTHaQNo0KytMD"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTH5KpXyx6sz0",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user36@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c6"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTH6Es3n9Txpd",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885573,
+                        "current_period_start": 1450207173,
+                        "customer": "cus_7XTH5KpXyx6sz0",
+                        "metadata": {
+                            "id": "0000000000000000000186c6"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTHaQNo0KytMD",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885571,
+                        "current_period_start": 1450207171,
+                        "customer": "cus_7XTH5KpXyx6sz0",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTH5KpXyx6sz0",
+                            "subscription": "sub_7XTHaQNo0KytMD"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c5"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -385,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCy7KaReE7xLUdan3pUgPg",
+        "path": "/v1/invoices/in_17IOKfKaReE7xLUdbPWU9fmO",
         "status": 200,
         "response": {
-            "id": "in_17GCy7KaReE7xLUdan3pUgPg",
-            "customer": "cus_7VDO2rAKGoRyuV",
+            "id": "in_17IOKfKaReE7xLUdbPWU9fmO",
+            "customer": "cus_7XTH5KpXyx6sz0",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOArVVxBdO8Z",
-                        "amount": 999,
+                        "id": "sub_7XTH6Es3n9Txpd",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c6"
                         },
@@ -403,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOArVVxBdO8Z",
-            "total": 999
+            "subscription": "sub_7XTH6Es3n9Txpd",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDO2rAKGoRyuV",
+        "path": "/v1/customers/cus_7XTH5KpXyx6sz0",
         "status": 200,
         "response": {
-            "id": "cus_7VDO2rAKGoRyuV",
+            "id": "cus_7XTH5KpXyx6sz0",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user136@me.com",
+            "email": "user36@me.com",
             "metadata": {
                 "id": "0000000000000000000186c6"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCy3KaReE7xLUd3P9sxPX6",
-                        "customer": "cus_7VDO2rAKGoRyuV"
+                        "id": "card_17IOKbKaReE7xLUdrhYtxEyz",
+                        "customer": "cus_7XTH5KpXyx6sz0"
                     }
                 ],
                 "has_more": false
@@ -440,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDOArVVxBdO8Z",
+                        "id": "sub_7XTH6Es3n9Txpd",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365235,
-                        "current_period_start": 1449686835,
-                        "customer": "cus_7VDO2rAKGoRyuV",
+                        "current_period_end": 1452885573,
+                        "current_period_start": 1450207173,
+                        "customer": "cus_7XTH5KpXyx6sz0",
                         "metadata": {
                             "id": "0000000000000000000186c6"
                         },
@@ -452,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDOI7IgrnOnfU",
+                        "id": "sub_7XTHaQNo0KytMD",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365233,
-                        "current_period_start": 1449686833,
-                        "customer": "cus_7VDO2rAKGoRyuV",
+                        "current_period_end": 1452885571,
+                        "current_period_start": 1450207171,
+                        "customer": "cus_7XTH5KpXyx6sz0",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDO2rAKGoRyuV",
-                            "subscription": "sub_7VDOI7IgrnOnfU"
+                            "customer": "cus_7XTH5KpXyx6sz0",
+                            "subscription": "sub_7XTHaQNo0KytMD"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -484,29 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCy5KaReE7xLUdWfZT15jA",
+        "path": "/v1/invoices/in_17IOKdKaReE7xLUdThjKzrft",
         "status": 200,
         "response": {
-            "id": "in_17GCy5KaReE7xLUdWfZT15jA",
-            "customer": "cus_7VDO2rAKGoRyuV",
+            "id": "in_17IOKdKaReE7xLUdThjKzrft",
+            "customer": "cus_7XTH5KpXyx6sz0",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDO2rAKGoRyuV",
-                "subscription": "sub_7VDOI7IgrnOnfU"
+                "customer": "cus_7XTH5KpXyx6sz0",
+                "subscription": "sub_7XTHaQNo0KytMD"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDOI7IgrnOnfU",
-                        "amount": 999,
+                        "id": "sub_7XTHaQNo0KytMD",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,7 +516,7 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDOI7IgrnOnfU",
+            "subscription": "sub_7XTHaQNo0KytMD",
             "total": 0
         }
     },
@@ -526,11 +526,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDOv27KBKz3BU",
+            "id": "cus_7XTH8WyLtDZn4y",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user135@foo.bar",
+            "email": "user35@foo.bar",
             "metadata": {
                 "id": "0000000000000000000186c5"
             },
diff --git a/spec/fixtures/sub-test-25.json b/spec/fixtures/sub-test-25.json
index 82bded541..92aef697a 100644
--- a/spec/fixtures/sub-test-25.json
+++ b/spec/fixtures/sub-test-25.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCyBKaReE7xLUd9G37bRkd",
+            "id": "tok_17IOKjKaReE7xLUdSnPDA5lt",
             "card": {
-                "id": "card_17GCyBKaReE7xLUdDzcyOMq0"
+                "id": "card_17IOKjKaReE7xLUdwl5pXWCj"
             },
             "type": "card"
         }
@@ -18,47 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user138@me.com",
+            "email": "user38@me.com",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user138@me.com",
-            "metadata": {
-                "id": "0000000000000000000186c8"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
                     }
                 ],
                 "has_more": false
@@ -71,7 +43,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE/subscriptions",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,79 +52,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE/subscriptions",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH",
         "status": 200,
         "response": {
-            "id": "sub_7VDPRTLVZfr2xD",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365241,
-            "current_period_start": 1449686841,
-            "customer": "cus_7VDPUcT1ISx3qE",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDPUcT1ISx3qE",
-                "subscription": "sub_7VDPRTLVZfr2xD"
-            },
-            "metadata": {
-                "id": "0000000000000000000186c7"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user138@me.com",
+            "email": "user38@me.com",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
                     }
                 ],
                 "has_more": false
             },
             "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPRTLVZfr2xD",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365241,
-                        "current_period_start": 1449686841,
-                        "customer": "cus_7VDPUcT1ISx3qE",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPUcT1ISx3qE",
-                            "subscription": "sub_7VDPRTLVZfr2xD"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c7"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
                 "has_more": false
             }
         }
@@ -160,14 +80,42 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE/subscriptions",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPKfPdazIoWu",
+            "id": "sub_7XTHwd6vTed9oA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365243,
-            "current_period_start": 1449686843,
-            "customer": "cus_7VDPUcT1ISx3qE",
+            "current_period_end": 1452885579,
+            "current_period_start": 1450207179,
+            "customer": "cus_7XTHbpnJyQvQDH",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTHbpnJyQvQDH",
+                "subscription": "sub_7XTHwd6vTed9oA"
+            },
+            "metadata": {
+                "id": "0000000000000000000186c7"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTHGzvZeeK6Ky",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885580,
+            "current_period_start": 1450207180,
+            "customer": "cus_7XTHbpnJyQvQDH",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
@@ -175,7 +123,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +134,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCyFKaReE7xLUdq9pABNeA",
-                    "customer": "cus_7VDPUcT1ISx3qE",
+                    "id": "in_17IOKmKaReE7xLUd2deb1eKq",
+                    "customer": "cus_7XTHbpnJyQvQDH",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPKfPdazIoWu",
-                                "amount": 999,
+                                "id": "sub_7XTHGzvZeeK6Ky",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c8"
                                 },
@@ -201,37 +149,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPKfPdazIoWu",
-                    "total": 999
+                    "subscription": "sub_7XTHGzvZeeK6Ky",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCyDKaReE7xLUdyDnGhQKL",
-                    "customer": "cus_7VDPUcT1ISx3qE",
+                    "id": "in_17IOKlKaReE7xLUd6kWYIEbb",
+                    "customer": "cus_7XTHbpnJyQvQDH",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUcT1ISx3qE",
-                        "subscription": "sub_7VDPRTLVZfr2xD"
+                        "customer": "cus_7XTHbpnJyQvQDH",
+                        "subscription": "sub_7XTHwd6vTed9oA"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPRTLVZfr2xD",
-                                "amount": 999,
+                                "id": "sub_7XTHwd6vTed9oA",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c7"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +189,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPRTLVZfr2xD",
+                    "subscription": "sub_7XTHwd6vTed9oA",
                     "total": 0
                 }
             ],
@@ -250,17 +198,84 @@
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCyFKaReE7xLUdq9pABNeA",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH",
         "status": 200,
         "response": {
-            "id": "in_17GCyFKaReE7xLUdq9pABNeA",
-            "customer": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user38@me.com",
+            "metadata": {
+                "id": "0000000000000000000186c8"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTHGzvZeeK6Ky",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885580,
+                        "current_period_start": 1450207180,
+                        "customer": "cus_7XTHbpnJyQvQDH",
+                        "metadata": {
+                            "id": "0000000000000000000186c8"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTHwd6vTed9oA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885579,
+                        "current_period_start": 1450207179,
+                        "customer": "cus_7XTHbpnJyQvQDH",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHbpnJyQvQDH",
+                            "subscription": "sub_7XTHwd6vTed9oA"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c7"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/invoices/in_17IOKmKaReE7xLUd2deb1eKq",
+        "status": 200,
+        "response": {
+            "id": "in_17IOKmKaReE7xLUd2deb1eKq",
+            "customer": "cus_7XTHbpnJyQvQDH",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPKfPdazIoWu",
-                        "amount": 999,
+                        "id": "sub_7XTHGzvZeeK6Ky",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c8"
                         },
@@ -269,36 +284,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPKfPdazIoWu",
-            "total": 999
+            "subscription": "sub_7XTHGzvZeeK6Ky",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user138@me.com",
+            "email": "user38@me.com",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
                     }
                 ],
                 "has_more": false
@@ -306,11 +321,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPKfPdazIoWu",
+                        "id": "sub_7XTHGzvZeeK6Ky",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365243,
-                        "current_period_start": 1449686843,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885580,
+                        "current_period_start": 1450207180,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "metadata": {
                             "id": "0000000000000000000186c8"
                         },
@@ -318,27 +333,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPRTLVZfr2xD",
+                        "id": "sub_7XTHwd6vTed9oA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365241,
-                        "current_period_start": 1449686841,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885579,
+                        "current_period_start": 1450207179,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUcT1ISx3qE",
-                            "subscription": "sub_7VDPRTLVZfr2xD"
+                            "customer": "cus_7XTHbpnJyQvQDH",
+                            "subscription": "sub_7XTHwd6vTed9oA"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -350,22 +365,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user138@me.com",
+            "email": "user38@me.com",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
                     }
                 ],
                 "has_more": false
@@ -373,11 +388,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPKfPdazIoWu",
+                        "id": "sub_7XTHGzvZeeK6Ky",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365243,
-                        "current_period_start": 1449686843,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885580,
+                        "current_period_start": 1450207180,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "metadata": {
                             "id": "0000000000000000000186c8"
                         },
@@ -385,27 +400,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPRTLVZfr2xD",
+                        "id": "sub_7XTHwd6vTed9oA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365241,
-                        "current_period_start": 1449686841,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885579,
+                        "current_period_start": 1450207179,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUcT1ISx3qE",
-                            "subscription": "sub_7VDPRTLVZfr2xD"
+                            "customer": "cus_7XTHbpnJyQvQDH",
+                            "subscription": "sub_7XTHwd6vTed9oA"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,22 +432,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUcT1ISx3qE",
+            "id": "cus_7XTHbpnJyQvQDH",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user138@me.com",
+            "email": "user38@me.com",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyBKaReE7xLUdDzcyOMq0",
-                        "customer": "cus_7VDPUcT1ISx3qE"
+                        "id": "card_17IOKjKaReE7xLUdwl5pXWCj",
+                        "customer": "cus_7XTHbpnJyQvQDH"
                     }
                 ],
                 "has_more": false
@@ -440,11 +455,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPKfPdazIoWu",
+                        "id": "sub_7XTHGzvZeeK6Ky",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365243,
-                        "current_period_start": 1449686843,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885580,
+                        "current_period_start": 1450207180,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "metadata": {
                             "id": "0000000000000000000186c8"
                         },
@@ -452,27 +467,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPRTLVZfr2xD",
+                        "id": "sub_7XTHwd6vTed9oA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365241,
-                        "current_period_start": 1449686841,
-                        "customer": "cus_7VDPUcT1ISx3qE",
+                        "current_period_end": 1452885579,
+                        "current_period_start": 1450207179,
+                        "customer": "cus_7XTHbpnJyQvQDH",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUcT1ISx3qE",
-                            "subscription": "sub_7VDPRTLVZfr2xD"
+                            "customer": "cus_7XTHbpnJyQvQDH",
+                            "subscription": "sub_7XTHwd6vTed9oA"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -484,29 +499,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyDKaReE7xLUdyDnGhQKL",
+        "path": "/v1/invoices/in_17IOKlKaReE7xLUd6kWYIEbb",
         "status": 200,
         "response": {
-            "id": "in_17GCyDKaReE7xLUdyDnGhQKL",
-            "customer": "cus_7VDPUcT1ISx3qE",
+            "id": "in_17IOKlKaReE7xLUd6kWYIEbb",
+            "customer": "cus_7XTHbpnJyQvQDH",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUcT1ISx3qE",
-                "subscription": "sub_7VDPRTLVZfr2xD"
+                "customer": "cus_7XTHbpnJyQvQDH",
+                "subscription": "sub_7XTHwd6vTed9oA"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPRTLVZfr2xD",
-                        "amount": 999,
+                        "id": "sub_7XTHwd6vTed9oA",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186c7"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,21 +531,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPRTLVZfr2xD",
+            "subscription": "sub_7XTHwd6vTed9oA",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE/subscriptions/sub_7VDPKfPdazIoWu",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH/subscriptions/sub_7XTHGzvZeeK6Ky",
         "status": 200,
         "response": {
-            "id": "sub_7VDPKfPdazIoWu",
+            "id": "sub_7XTHGzvZeeK6Ky",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365243,
-            "current_period_start": 1449686843,
-            "customer": "cus_7VDPUcT1ISx3qE",
+            "current_period_end": 1452885580,
+            "current_period_start": 1450207180,
+            "customer": "cus_7XTHbpnJyQvQDH",
             "metadata": {
                 "id": "0000000000000000000186c8"
             },
@@ -538,33 +553,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUcT1ISx3qE/subscriptions/sub_7VDPRTLVZfr2xD",
+        "path": "/v1/customers/cus_7XTHbpnJyQvQDH/subscriptions/sub_7XTHwd6vTed9oA",
         "status": 200,
         "response": {
-            "id": "sub_7VDPRTLVZfr2xD",
+            "id": "sub_7XTHwd6vTed9oA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365241,
-            "current_period_start": 1449686841,
-            "customer": "cus_7VDPUcT1ISx3qE",
+            "current_period_end": 1452885579,
+            "current_period_start": 1450207179,
+            "customer": "cus_7XTHbpnJyQvQDH",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUcT1ISx3qE",
-                "subscription": "sub_7VDPRTLVZfr2xD"
+                "customer": "cus_7XTHbpnJyQvQDH",
+                "subscription": "sub_7XTHwd6vTed9oA"
             },
             "metadata": {
                 "id": "0000000000000000000186c7"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-26.json b/spec/fixtures/sub-test-26.json
index ba6471698..a85aa67e6 100644
--- a/spec/fixtures/sub-test-26.json
+++ b/spec/fixtures/sub-test-26.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCyJKaReE7xLUdejgGY4Xu",
+            "id": "tok_17IOKqKaReE7xLUdC0S28Xag",
             "card": {
-                "id": "card_17GCyJKaReE7xLUdBO7GL3HP"
+                "id": "card_17IOKqKaReE7xLUdg6WAdpDC"
             },
             "type": "card"
         }
@@ -18,19 +18,47 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTHVR8SuAH05K",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user41@me.com",
+            "metadata": {
+                "id": "0000000000000000000186cb"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -43,7 +71,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -52,55 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user141@me.com",
-            "metadata": {
-                "id": "0000000000000000000186cb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDPlVfpIKvKXW",
+            "id": "sub_7XTHlNeS0NyiAf",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365248,
-            "current_period_start": 1449686848,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885586,
+            "current_period_start": 1450207186,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPlVfpIKvKXW"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHlNeS0NyiAf"
             },
             "metadata": {
                 "id": "0000000000000000000186c9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,29 +108,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDPlVfpIKvKXW",
+                    "id": "sub_7XTHlNeS0NyiAf",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365248,
-                    "current_period_start": 1449686848,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885586,
+                    "current_period_start": 1450207186,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "metadata": {
                         "id": "0000000000000000000186c9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -141,27 +141,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDP8DUlXwzxqe",
+            "id": "sub_7XTHDekHFOpjBF",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365250,
-            "current_period_start": 1449686850,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885588,
+            "current_period_start": 1450207188,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDP8DUlXwzxqe"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHDekHFOpjBF"
             },
             "metadata": {
                 "id": "0000000000000000000186ca"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -169,88 +169,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user141@me.com",
-            "metadata": {
-                "id": "0000000000000000000186cb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDP8DUlXwzxqe",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ca"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDPlVfpIKvKXW",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c9"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDPXNbIbAwIo7",
+            "id": "sub_7XTHToeihCliHA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365253,
-            "current_period_start": 1449686853,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885589,
+            "current_period_start": 1450207189,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -258,96 +184,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDPTpDHVQmPes",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user141@me.com",
-            "metadata": {
-                "id": "0000000000000000000186cb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPXNbIbAwIo7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365253,
-                        "current_period_start": 1449686853,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "metadata": {
-                            "id": "0000000000000000000186cb"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 1798
-                    },
-                    {
-                        "id": "sub_7VDP8DUlXwzxqe",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ca"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDPlVfpIKvKXW",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c9"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "quantity": 180
         }
     },
     {
@@ -358,13 +195,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCyPKaReE7xLUdug9wmkcE",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKvKaReE7xLUdARp9ZTEf",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPXNbIbAwIo7",
-                                "amount": 1798,
+                                "id": "sub_7XTHToeihCliHA",
+                                "amount": 180,
                                 "metadata": {
                                     "id": "0000000000000000000186cb"
                                 },
@@ -373,37 +210,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 1798,
+                                "quantity": 180,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPXNbIbAwIo7",
-                    "total": 1798
+                    "subscription": "sub_7XTHToeihCliHA",
+                    "total": 180
                 },
                 {
-                    "id": "in_17GCyMKaReE7xLUdIgGA1rVx",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKuKaReE7xLUdvj28FD1a",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP8DUlXwzxqe",
-                                "amount": 999,
+                                "id": "sub_7XTHDekHFOpjBF",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ca"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -413,30 +250,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP8DUlXwzxqe",
+                    "subscription": "sub_7XTHDekHFOpjBF",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyKKaReE7xLUdIWQvRDZ0",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKsKaReE7xLUdufOxGJjo",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPlVfpIKvKXW",
-                                "amount": 999,
+                                "id": "sub_7XTHlNeS0NyiAf",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -446,7 +283,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPlVfpIKvKXW",
+                    "subscription": "sub_7XTHlNeS0NyiAf",
                     "total": 0
                 }
             ],
@@ -456,22 +293,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -479,11 +316,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPXNbIbAwIo7",
+                        "id": "sub_7XTHToeihCliHA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365253,
-                        "current_period_start": 1449686853,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885589,
+                        "current_period_start": 1450207189,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -491,49 +328,138 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
+                        "id": "sub_7XTHlNeS0NyiAf",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTHVR8SuAH05K",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user41@me.com",
+            "metadata": {
+                "id": "0000000000000000000186cb"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTHToeihCliHA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885589,
+                        "current_period_start": 1450207189,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "metadata": {
+                            "id": "0000000000000000000186cb"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 180
+                    },
+                    {
+                        "id": "sub_7XTHDekHFOpjBF",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186ca"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTHlNeS0NyiAf",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c9"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -545,16 +471,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyPKaReE7xLUdug9wmkcE",
+        "path": "/v1/invoices/in_17IOKvKaReE7xLUdARp9ZTEf",
         "status": 200,
         "response": {
-            "id": "in_17GCyPKaReE7xLUdug9wmkcE",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOKvKaReE7xLUdARp9ZTEf",
+            "customer": "cus_7XTHVR8SuAH05K",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPXNbIbAwIo7",
-                        "amount": 1798,
+                        "id": "sub_7XTHToeihCliHA",
+                        "amount": 180,
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -563,36 +489,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 1798,
+                        "quantity": 180,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPXNbIbAwIo7",
-            "total": 1798
+            "subscription": "sub_7XTHToeihCliHA",
+            "total": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -600,11 +526,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPXNbIbAwIo7",
+                        "id": "sub_7XTHToeihCliHA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365253,
-                        "current_period_start": 1449686853,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885589,
+                        "current_period_start": 1450207189,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -612,49 +538,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
+                        "id": "sub_7XTHlNeS0NyiAf",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -666,68 +592,118 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyMKaReE7xLUdIgGA1rVx",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "in_17GCyMKaReE7xLUdIgGA1rVx",
-            "customer": "cus_7VDPTpDHVQmPes",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDP8DUlXwzxqe"
+            "id": "cus_7XTHVR8SuAH05K",
+            "alipay_accounts": {
+                "has_more": false
             },
-            "lines": {
+            "email": "user41@me.com",
+            "metadata": {
+                "id": "0000000000000000000186cb"
+            },
+            "sources": {
                 "data": [
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
-                        "amount": 999,
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTHToeihCliHA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885589,
+                        "current_period_start": 1450207189,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "metadata": {
+                            "id": "0000000000000000000186cb"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 180
+                    },
+                    {
+                        "id": "sub_7XTHDekHFOpjBF",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
+                        },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
-                        "proration": false,
-                        "quantity": 1,
-                        "type": "subscription"
-                    }
-                ],
-                "has_more": false
-            },
-            "paid": true,
-            "subscription": "sub_7VDP8DUlXwzxqe",
-            "total": 0
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCyKKaReE7xLUdIWQvRDZ0",
-        "status": 200,
-        "response": {
-            "id": "in_17GCyKKaReE7xLUdIWQvRDZ0",
-            "customer": "cus_7VDPTpDHVQmPes",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPlVfpIKvKXW"
-            },
-            "lines": {
-                "data": [
+                        "quantity": 1
+                    },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
-                        "amount": 999,
+                        "id": "sub_7XTHlNeS0NyiAf",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
+                        },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/invoices/in_17IOKuKaReE7xLUdvj28FD1a",
+        "status": 200,
+        "response": {
+            "id": "in_17IOKuKaReE7xLUdvj28FD1a",
+            "customer": "cus_7XTHVR8SuAH05K",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHDekHFOpjBF"
+            },
+            "lines": {
+                "data": [
+                    {
+                        "id": "sub_7XTHDekHFOpjBF",
+                        "amount": 100,
+                        "metadata": {
+                            "id": "0000000000000000000186ca"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -737,21 +713,60 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPlVfpIKvKXW",
+            "subscription": "sub_7XTHDekHFOpjBF",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPXNbIbAwIo7",
+        "path": "/v1/invoices/in_17IOKsKaReE7xLUdufOxGJjo",
         "status": 200,
         "response": {
-            "id": "sub_7VDPXNbIbAwIo7",
+            "id": "in_17IOKsKaReE7xLUdufOxGJjo",
+            "customer": "cus_7XTHVR8SuAH05K",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHlNeS0NyiAf"
+            },
+            "lines": {
+                "data": [
+                    {
+                        "id": "sub_7XTHlNeS0NyiAf",
+                        "amount": 100,
+                        "metadata": {
+                            "id": "0000000000000000000186c9"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "proration": false,
+                        "quantity": 1,
+                        "type": "subscription"
+                    }
+                ],
+                "has_more": false
+            },
+            "paid": true,
+            "subscription": "sub_7XTHlNeS0NyiAf",
+            "total": 0
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHToeihCliHA",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTHToeihCliHA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365253,
-            "current_period_start": 1449686853,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885589,
+            "current_period_start": 1450207189,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -759,20 +774,20 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPXNbIbAwIo7",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHToeihCliHA",
         "status": 200,
         "response": {
-            "id": "sub_7VDPXNbIbAwIo7",
+            "id": "sub_7XTHToeihCliHA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365253,
-            "current_period_start": 1449686853,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885589,
+            "current_period_start": 1450207189,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -780,28 +795,28 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -809,46 +824,46 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
+                        "id": "sub_7XTHlNeS0NyiAf",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -860,27 +875,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPlVfpIKvKXW",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHlNeS0NyiAf",
         "status": 200,
         "response": {
-            "id": "sub_7VDPlVfpIKvKXW",
+            "id": "sub_7XTHlNeS0NyiAf",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365248,
-            "current_period_start": 1449686848,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885586,
+            "current_period_start": 1450207186,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPlVfpIKvKXW"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHlNeS0NyiAf"
             },
             "metadata": {
                 "id": "0000000000000000000186c9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -888,27 +903,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDP8DUlXwzxqe",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHDekHFOpjBF",
         "status": 200,
         "response": {
-            "id": "sub_7VDP8DUlXwzxqe",
+            "id": "sub_7XTHDekHFOpjBF",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365250,
-            "current_period_start": 1449686850,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885588,
+            "current_period_start": 1450207188,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDP8DUlXwzxqe"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHDekHFOpjBF"
             },
             "metadata": {
                 "id": "0000000000000000000186ca"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -916,51 +931,51 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDP8DUlXwzxqe",
+                    "id": "sub_7XTHDekHFOpjBF",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365250,
-                    "current_period_start": 1449686850,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885588,
+                    "current_period_start": 1450207188,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ca"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDPlVfpIKvKXW",
+                    "id": "sub_7XTHlNeS0NyiAf",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365248,
-                    "current_period_start": 1449686848,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885586,
+                    "current_period_start": 1450207186,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "metadata": {
                         "id": "0000000000000000000186c9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -971,22 +986,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -994,46 +1009,46 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
+                        "id": "sub_7XTHlNeS0NyiAf",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1045,22 +1060,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -1068,46 +1083,46 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPlVfpIKvKXW",
+                        "id": "sub_7XTHlNeS0NyiAf",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686848,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207186,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPlVfpIKvKXW"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHlNeS0NyiAf"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1119,51 +1134,51 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDP8DUlXwzxqe",
+                    "id": "sub_7XTHDekHFOpjBF",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365250,
-                    "current_period_start": 1449686850,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885588,
+                    "current_period_start": 1450207188,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ca"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDPlVfpIKvKXW",
+                    "id": "sub_7XTHlNeS0NyiAf",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365248,
-                    "current_period_start": 1449686848,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885586,
+                    "current_period_start": 1450207186,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "metadata": {
                         "id": "0000000000000000000186c9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -1174,27 +1189,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPlVfpIKvKXW",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHlNeS0NyiAf",
         "status": 200,
         "response": {
-            "id": "sub_7VDPlVfpIKvKXW",
+            "id": "sub_7XTHlNeS0NyiAf",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365248,
-            "current_period_start": 1449686848,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885586,
+            "current_period_start": 1450207186,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPlVfpIKvKXW"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHlNeS0NyiAf"
             },
             "metadata": {
                 "id": "0000000000000000000186c9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1202,27 +1217,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPn5rYllQBCH",
+            "id": "sub_7XTHldhzaQkx1i",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365248,
-            "current_period_start": 1449686862,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885586,
+            "current_period_start": 1450207202,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPn5rYllQBCH"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHldhzaQkx1i"
             },
             "metadata": {
                 "id": "0000000000000000000186c9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1230,22 +1245,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -1253,46 +1268,46 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1304,14 +1319,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPAHKKcnA0yC",
+            "id": "sub_7XTHwtTYHn4JUv",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365264,
-            "current_period_start": 1449686864,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885604,
+            "current_period_start": 1450207204,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -1319,7 +1334,96 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTHVR8SuAH05K",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user41@me.com",
+            "metadata": {
+                "id": "0000000000000000000186cb"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTHwtTYHn4JUv",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885604,
+                        "current_period_start": 1450207204,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "metadata": {
+                            "id": "0000000000000000000186cb"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTHldhzaQkx1i",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186c9"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTHDekHFOpjBF",
+                        "cancel_at_period_end": true,
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186ca"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -1330,13 +1434,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCyaKaReE7xLUdzVCf5LhH",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOLAKaReE7xLUdv7e9xOW0",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPAHKKcnA0yC",
-                                "amount": 999,
+                                "id": "sub_7XTHwtTYHn4JUv",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cb"
                                 },
@@ -1345,37 +1449,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPAHKKcnA0yC",
-                    "total": 999
+                    "subscription": "sub_7XTHwtTYHn4JUv",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCyYKaReE7xLUd3WGAl0cW",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOL8KaReE7xLUdEZs6nuTI",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPn5rYllQBCH"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHldhzaQkx1i"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPn5rYllQBCH",
+                                "id": "sub_7XTHldhzaQkx1i",
                                 "amount": 0,
                                 "metadata": {
                                     "id": "0000000000000000000186c9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1385,17 +1489,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPn5rYllQBCH",
+                    "subscription": "sub_7XTHldhzaQkx1i",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyPKaReE7xLUdug9wmkcE",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKvKaReE7xLUdARp9ZTEf",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPXNbIbAwIo7",
-                                "amount": 1798,
+                                "id": "sub_7XTHToeihCliHA",
+                                "amount": 180,
                                 "metadata": {
                                     "id": "0000000000000000000186cb"
                                 },
@@ -1404,37 +1508,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 1798,
+                                "quantity": 180,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPXNbIbAwIo7",
-                    "total": 1798
+                    "subscription": "sub_7XTHToeihCliHA",
+                    "total": 180
                 },
                 {
-                    "id": "in_17GCyMKaReE7xLUdIgGA1rVx",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKuKaReE7xLUdvj28FD1a",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP8DUlXwzxqe",
-                                "amount": 999,
+                                "id": "sub_7XTHDekHFOpjBF",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ca"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1444,30 +1548,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP8DUlXwzxqe",
+                    "subscription": "sub_7XTHDekHFOpjBF",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyKKaReE7xLUdIWQvRDZ0",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKsKaReE7xLUdufOxGJjo",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPlVfpIKvKXW",
-                                "amount": 999,
+                                "id": "sub_7XTHlNeS0NyiAf",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1477,7 +1581,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPlVfpIKvKXW",
+                    "subscription": "sub_7XTHlNeS0NyiAf",
                     "total": 0
                 }
             ],
@@ -1487,22 +1591,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -1510,11 +1614,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPAHKKcnA0yC",
+                        "id": "sub_7XTHwtTYHn4JUv",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365264,
-                        "current_period_start": 1449686864,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885604,
+                        "current_period_start": 1450207204,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -1522,49 +1626,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1576,16 +1680,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyaKaReE7xLUdzVCf5LhH",
+        "path": "/v1/invoices/in_17IOLAKaReE7xLUdv7e9xOW0",
         "status": 200,
         "response": {
-            "id": "in_17GCyaKaReE7xLUdzVCf5LhH",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOLAKaReE7xLUdv7e9xOW0",
+            "customer": "cus_7XTHVR8SuAH05K",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPAHKKcnA0yC",
-                        "amount": 999,
+                        "id": "sub_7XTHwtTYHn4JUv",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -1594,132 +1698,43 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPAHKKcnA0yC",
-            "total": 999
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDPTpDHVQmPes",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user141@me.com",
-            "metadata": {
-                "id": "0000000000000000000186cb"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPAHKKcnA0yC",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365264,
-                        "current_period_start": 1449686864,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "metadata": {
-                            "id": "0000000000000000000186cb"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDPn5rYllQBCH",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186c9"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDP8DUlXwzxqe",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ca"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "subscription": "sub_7XTHwtTYHn4JUv",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyYKaReE7xLUd3WGAl0cW",
+        "path": "/v1/invoices/in_17IOL8KaReE7xLUdEZs6nuTI",
         "status": 200,
         "response": {
-            "id": "in_17GCyYKaReE7xLUd3WGAl0cW",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOL8KaReE7xLUdEZs6nuTI",
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPn5rYllQBCH"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHldhzaQkx1i"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "amount": 0,
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1729,21 +1744,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPn5rYllQBCH",
+            "subscription": "sub_7XTHldhzaQkx1i",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPAHKKcnA0yC",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHwtTYHn4JUv",
         "status": 200,
         "response": {
-            "id": "sub_7VDPAHKKcnA0yC",
+            "id": "sub_7XTHwtTYHn4JUv",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365264,
-            "current_period_start": 1449686864,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885604,
+            "current_period_start": 1450207204,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -1751,33 +1766,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPn5rYllQBCH",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHldhzaQkx1i",
         "status": 200,
         "response": {
-            "id": "sub_7VDPn5rYllQBCH",
+            "id": "sub_7XTHldhzaQkx1i",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365248,
-            "current_period_start": 1449686862,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885586,
+            "current_period_start": 1450207202,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPn5rYllQBCH"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHldhzaQkx1i"
             },
             "metadata": {
                 "id": "0000000000000000000186c9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1785,22 +1800,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -1808,11 +1823,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPAHKKcnA0yC",
+                        "id": "sub_7XTHwtTYHn4JUv",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365264,
-                        "current_period_start": 1449686864,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885604,
+                        "current_period_start": 1450207204,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -1820,49 +1835,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1874,16 +1889,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDPAHKKcnA0yC",
+                    "id": "sub_7XTHwtTYHn4JUv",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365264,
-                    "current_period_start": 1449686864,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885604,
+                    "current_period_start": 1450207204,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "metadata": {
                         "id": "0000000000000000000186cb"
                     },
@@ -1891,49 +1906,49 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 999
+                    "quantity": 100
                 },
                 {
-                    "id": "sub_7VDPn5rYllQBCH",
+                    "id": "sub_7XTHldhzaQkx1i",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365248,
-                    "current_period_start": 1449686862,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885586,
+                    "current_period_start": 1450207202,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPn5rYllQBCH"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHldhzaQkx1i"
                     },
                     "metadata": {
                         "id": "0000000000000000000186c9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDP8DUlXwzxqe",
+                    "id": "sub_7XTHDekHFOpjBF",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365250,
-                    "current_period_start": 1449686850,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885588,
+                    "current_period_start": 1450207188,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ca"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -1944,27 +1959,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPOhhwJPMC3M",
+            "id": "sub_7XTHpfYH5cq3F8",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365267,
-            "current_period_start": 1449686867,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885609,
+            "current_period_start": 1450207209,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPOhhwJPMC3M"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHpfYH5cq3F8"
             },
             "metadata": {
                 "id": "0000000000000000000186cc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1972,22 +1987,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -1995,33 +2010,33 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPOhhwJPMC3M",
+                        "id": "sub_7XTHpfYH5cq3F8",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365267,
-                        "current_period_start": 1449686867,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885609,
+                        "current_period_start": 1450207209,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPOhhwJPMC3M"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHpfYH5cq3F8"
                         },
                         "metadata": {
                             "id": "0000000000000000000186cc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPAHKKcnA0yC",
+                        "id": "sub_7XTHwtTYHn4JUv",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365264,
-                        "current_period_start": 1449686864,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885604,
+                        "current_period_start": 1450207204,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -2029,49 +2044,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2083,38 +2098,38 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDPOhhwJPMC3M",
+                    "id": "sub_7XTHpfYH5cq3F8",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365267,
-                    "current_period_start": 1449686867,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885609,
+                    "current_period_start": 1450207209,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPOhhwJPMC3M"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHpfYH5cq3F8"
                     },
                     "metadata": {
                         "id": "0000000000000000000186cc"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDPAHKKcnA0yC",
+                    "id": "sub_7XTHwtTYHn4JUv",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365264,
-                    "current_period_start": 1449686864,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885604,
+                    "current_period_start": 1450207204,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "metadata": {
                         "id": "0000000000000000000186cb"
                     },
@@ -2122,49 +2137,49 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 999
+                    "quantity": 100
                 },
                 {
-                    "id": "sub_7VDPn5rYllQBCH",
+                    "id": "sub_7XTHldhzaQkx1i",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365248,
-                    "current_period_start": 1449686862,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885586,
+                    "current_period_start": 1450207202,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPn5rYllQBCH"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHldhzaQkx1i"
                     },
                     "metadata": {
                         "id": "0000000000000000000186c9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDP8DUlXwzxqe",
+                    "id": "sub_7XTHDekHFOpjBF",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365250,
-                    "current_period_start": 1449686850,
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "current_period_end": 1452885588,
+                    "current_period_start": 1450207188,
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ca"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -2175,14 +2190,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPAHKKcnA0yC",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHwtTYHn4JUv",
         "status": 200,
         "response": {
-            "id": "sub_7VDPAHKKcnA0yC",
+            "id": "sub_7XTHwtTYHn4JUv",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365264,
-            "current_period_start": 1449686864,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885604,
+            "current_period_start": 1450207204,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -2190,7 +2205,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
@@ -2199,41 +2214,41 @@
         "path": "/v1/invoices",
         "status": 200,
         "response": {
-            "id": "in_17GCyhKaReE7xLUdIBGKICtG",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOLJKaReE7xLUdfCD7XS3J",
+            "customer": "cus_7XTHVR8SuAH05K",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCygKaReE7xLUdcFdYfLUG",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLIKaReE7xLUdjns5UdB8",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDPAHKKcnA0yC",
+                        "quantity": 100,
+                        "subscription": "sub_7XTHwtTYHn4JUv",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCygKaReE7xLUdlTp9oMaD",
-                        "amount": 1798,
-                        "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLIKaReE7xLUdjYPZLcbN",
+                        "amount": 180,
+                        "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 1798,
-                        "subscription": "sub_7VDPAHKKcnA0yC",
+                        "quantity": 180,
+                        "subscription": "sub_7XTHwtTYHn4JUv",
                         "type": "invoiceitem"
                     }
                 ],
                 "has_more": false
             },
             "paid": false,
-            "total": 799
+            "total": 80
         }
     },
     {
@@ -2244,63 +2259,63 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCyhKaReE7xLUdIBGKICtG",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOLJKaReE7xLUdfCD7XS3J",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "ii_17GCygKaReE7xLUdcFdYfLUG",
-                                "amount": -999,
-                                "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLIKaReE7xLUdjns5UdB8",
+                                "amount": -100,
+                                "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 999,
-                                "subscription": "sub_7VDPAHKKcnA0yC",
+                                "quantity": 100,
+                                "subscription": "sub_7XTHwtTYHn4JUv",
                                 "type": "invoiceitem"
                             },
                             {
-                                "id": "ii_17GCygKaReE7xLUdlTp9oMaD",
-                                "amount": 1798,
-                                "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLIKaReE7xLUdjYPZLcbN",
+                                "amount": 180,
+                                "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 1798,
-                                "subscription": "sub_7VDPAHKKcnA0yC",
+                                "quantity": 180,
+                                "subscription": "sub_7XTHwtTYHn4JUv",
                                 "type": "invoiceitem"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": false,
-                    "total": 799
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCydKaReE7xLUdL6oTceIa",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOLFKaReE7xLUdYFMHfsa6",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPOhhwJPMC3M"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHpfYH5cq3F8"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPOhhwJPMC3M",
-                                "amount": 999,
+                                "id": "sub_7XTHpfYH5cq3F8",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cc"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -2310,17 +2325,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPOhhwJPMC3M",
+                    "subscription": "sub_7XTHpfYH5cq3F8",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyaKaReE7xLUdzVCf5LhH",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOLAKaReE7xLUdv7e9xOW0",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPAHKKcnA0yC",
-                                "amount": 999,
+                                "id": "sub_7XTHwtTYHn4JUv",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cb"
                                 },
@@ -2329,37 +2344,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPAHKKcnA0yC",
-                    "total": 999
+                    "subscription": "sub_7XTHwtTYHn4JUv",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCyYKaReE7xLUd3WGAl0cW",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOL8KaReE7xLUdEZs6nuTI",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPn5rYllQBCH"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHldhzaQkx1i"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPn5rYllQBCH",
+                                "id": "sub_7XTHldhzaQkx1i",
                                 "amount": 0,
                                 "metadata": {
                                     "id": "0000000000000000000186c9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -2369,17 +2384,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPn5rYllQBCH",
+                    "subscription": "sub_7XTHldhzaQkx1i",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyPKaReE7xLUdug9wmkcE",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKvKaReE7xLUdARp9ZTEf",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPXNbIbAwIo7",
-                                "amount": 1798,
+                                "id": "sub_7XTHToeihCliHA",
+                                "amount": 180,
                                 "metadata": {
                                     "id": "0000000000000000000186cb"
                                 },
@@ -2388,37 +2403,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 1798,
+                                "quantity": 180,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPXNbIbAwIo7",
-                    "total": 1798
+                    "subscription": "sub_7XTHToeihCliHA",
+                    "total": 180
                 },
                 {
-                    "id": "in_17GCyMKaReE7xLUdIgGA1rVx",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKuKaReE7xLUdvj28FD1a",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDP8DUlXwzxqe"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHDekHFOpjBF"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP8DUlXwzxqe",
-                                "amount": 999,
+                                "id": "sub_7XTHDekHFOpjBF",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ca"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -2428,30 +2443,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP8DUlXwzxqe",
+                    "subscription": "sub_7XTHDekHFOpjBF",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCyKKaReE7xLUdIWQvRDZ0",
-                    "customer": "cus_7VDPTpDHVQmPes",
+                    "id": "in_17IOKsKaReE7xLUdufOxGJjo",
+                    "customer": "cus_7XTHVR8SuAH05K",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPTpDHVQmPes",
-                        "subscription": "sub_7VDPlVfpIKvKXW"
+                        "customer": "cus_7XTHVR8SuAH05K",
+                        "subscription": "sub_7XTHlNeS0NyiAf"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPlVfpIKvKXW",
-                                "amount": 999,
+                                "id": "sub_7XTHlNeS0NyiAf",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186c9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -2461,7 +2476,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPlVfpIKvKXW",
+                    "subscription": "sub_7XTHlNeS0NyiAf",
                     "total": 0
                 }
             ],
@@ -2471,22 +2486,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K",
         "status": 200,
         "response": {
-            "id": "cus_7VDPTpDHVQmPes",
+            "id": "cus_7XTHVR8SuAH05K",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user141@me.com",
+            "email": "user41@me.com",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCyJKaReE7xLUdBO7GL3HP",
-                        "customer": "cus_7VDPTpDHVQmPes"
+                        "id": "card_17IOKqKaReE7xLUdg6WAdpDC",
+                        "customer": "cus_7XTHVR8SuAH05K"
                     }
                 ],
                 "has_more": false
@@ -2494,11 +2509,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPAHKKcnA0yC",
+                        "id": "sub_7XTHwtTYHn4JUv",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365264,
-                        "current_period_start": 1449686864,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885604,
+                        "current_period_start": 1450207204,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "metadata": {
                             "id": "0000000000000000000186cb"
                         },
@@ -2506,71 +2521,71 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDPOhhwJPMC3M",
+                        "id": "sub_7XTHpfYH5cq3F8",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365267,
-                        "current_period_start": 1449686867,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885609,
+                        "current_period_start": 1450207209,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPOhhwJPMC3M"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHpfYH5cq3F8"
                         },
                         "metadata": {
                             "id": "0000000000000000000186cc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDPn5rYllQBCH",
+                        "id": "sub_7XTHldhzaQkx1i",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365248,
-                        "current_period_start": 1449686862,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885586,
+                        "current_period_start": 1450207202,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDPn5rYllQBCH"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHldhzaQkx1i"
                         },
                         "metadata": {
                             "id": "0000000000000000000186c9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP8DUlXwzxqe",
+                        "id": "sub_7XTHDekHFOpjBF",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365250,
-                        "current_period_start": 1449686850,
-                        "customer": "cus_7VDPTpDHVQmPes",
+                        "current_period_end": 1452885588,
+                        "current_period_start": 1450207188,
+                        "customer": "cus_7XTHVR8SuAH05K",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPTpDHVQmPes",
-                            "subscription": "sub_7VDP8DUlXwzxqe"
+                            "customer": "cus_7XTHVR8SuAH05K",
+                            "subscription": "sub_7XTHDekHFOpjBF"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ca"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2582,72 +2597,72 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCyhKaReE7xLUdIBGKICtG",
+        "path": "/v1/invoices/in_17IOLJKaReE7xLUdfCD7XS3J",
         "status": 200,
         "response": {
-            "id": "in_17GCyhKaReE7xLUdIBGKICtG",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOLJKaReE7xLUdfCD7XS3J",
+            "customer": "cus_7XTHVR8SuAH05K",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCygKaReE7xLUdcFdYfLUG",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLIKaReE7xLUdjns5UdB8",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDPAHKKcnA0yC",
+                        "quantity": 100,
+                        "subscription": "sub_7XTHwtTYHn4JUv",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCygKaReE7xLUdlTp9oMaD",
-                        "amount": 1798,
-                        "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLIKaReE7xLUdjYPZLcbN",
+                        "amount": 180,
+                        "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 1798,
-                        "subscription": "sub_7VDPAHKKcnA0yC",
+                        "quantity": 180,
+                        "subscription": "sub_7XTHwtTYHn4JUv",
                         "type": "invoiceitem"
                     }
                 ],
                 "has_more": false
             },
             "paid": false,
-            "total": 799
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCydKaReE7xLUdL6oTceIa",
+        "path": "/v1/invoices/in_17IOLFKaReE7xLUdYFMHfsa6",
         "status": 200,
         "response": {
-            "id": "in_17GCydKaReE7xLUdL6oTceIa",
-            "customer": "cus_7VDPTpDHVQmPes",
+            "id": "in_17IOLFKaReE7xLUdYFMHfsa6",
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPOhhwJPMC3M"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHpfYH5cq3F8"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPOhhwJPMC3M",
-                        "amount": 999,
+                        "id": "sub_7XTHpfYH5cq3F8",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186cc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -2657,21 +2672,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPOhhwJPMC3M",
+            "subscription": "sub_7XTHpfYH5cq3F8",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPAHKKcnA0yC",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHwtTYHn4JUv",
         "status": 200,
         "response": {
-            "id": "sub_7VDPAHKKcnA0yC",
+            "id": "sub_7XTHwtTYHn4JUv",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365264,
-            "current_period_start": 1449686864,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885604,
+            "current_period_start": 1450207204,
+            "customer": "cus_7XTHVR8SuAH05K",
             "metadata": {
                 "id": "0000000000000000000186cb"
             },
@@ -2679,33 +2694,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPTpDHVQmPes/subscriptions/sub_7VDPOhhwJPMC3M",
+        "path": "/v1/customers/cus_7XTHVR8SuAH05K/subscriptions/sub_7XTHpfYH5cq3F8",
         "status": 200,
         "response": {
-            "id": "sub_7VDPOhhwJPMC3M",
+            "id": "sub_7XTHpfYH5cq3F8",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365267,
-            "current_period_start": 1449686867,
-            "customer": "cus_7VDPTpDHVQmPes",
+            "current_period_end": 1452885609,
+            "current_period_start": 1450207209,
+            "customer": "cus_7XTHVR8SuAH05K",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPTpDHVQmPes",
-                "subscription": "sub_7VDPOhhwJPMC3M"
+                "customer": "cus_7XTHVR8SuAH05K",
+                "subscription": "sub_7XTHpfYH5cq3F8"
             },
             "metadata": {
                 "id": "0000000000000000000186cc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-27.json b/spec/fixtures/sub-test-27.json
index 781dce86a..ae3407709 100644
--- a/spec/fixtures/sub-test-27.json
+++ b/spec/fixtures/sub-test-27.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCylKaReE7xLUdQxifWaYp",
+            "id": "tok_17IOLNKaReE7xLUdSX3WVx0D",
             "card": {
-                "id": "card_17GCylKaReE7xLUd4WnpSJTw"
+                "id": "card_17IOLNKaReE7xLUd9h1tUuhs"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -71,7 +71,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDP47YSQKI8ud",
+            "id": "sub_7XTHh8nw8chSad",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365277,
-            "current_period_start": 1449686877,
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "current_period_end": 1452885619,
+            "current_period_start": 1450207219,
+            "customer": "cus_7XTHkjYW7hakrU",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUDYQvLGYc6",
-                "subscription": "sub_7VDP47YSQKI8ud"
+                "customer": "cus_7XTHkjYW7hakrU",
+                "subscription": "sub_7XTHh8nw8chSad"
             },
             "metadata": {
                 "id": "0000000000000000000186ce"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,22 +108,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -131,24 +131,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -160,14 +160,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPabDqWaXXl4",
+            "id": "sub_7XTI7W8CIY0DXL",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365279,
-            "current_period_start": 1449686879,
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "current_period_end": 1452885620,
+            "current_period_start": 1450207220,
+            "customer": "cus_7XTHkjYW7hakrU",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
@@ -175,7 +175,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
@@ -186,13 +186,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCypKaReE7xLUd2ptZ1BhX",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLQKaReE7xLUdCQW53FjQ",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPabDqWaXXl4",
-                                "amount": 999,
+                                "id": "sub_7XTI7W8CIY0DXL",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cf"
                                 },
@@ -201,37 +201,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPabDqWaXXl4",
-                    "total": 999
+                    "subscription": "sub_7XTI7W8CIY0DXL",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCynKaReE7xLUdhjiRodmo",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLPKaReE7xLUd3jd9QmjK",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDP47YSQKI8ud"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTHh8nw8chSad"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP47YSQKI8ud",
-                                "amount": 999,
+                                "id": "sub_7XTHh8nw8chSad",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ce"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +241,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP47YSQKI8ud",
+                    "subscription": "sub_7XTHh8nw8chSad",
                     "total": 0
                 }
             ],
@@ -251,22 +251,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -274,11 +274,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
+                        "id": "sub_7XTI7W8CIY0DXL",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -286,27 +286,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,22 +318,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -341,11 +341,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
+                        "id": "sub_7XTI7W8CIY0DXL",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -353,27 +353,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -385,16 +385,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCypKaReE7xLUd2ptZ1BhX",
+        "path": "/v1/invoices/in_17IOLQKaReE7xLUdCQW53FjQ",
         "status": 200,
         "response": {
-            "id": "in_17GCypKaReE7xLUd2ptZ1BhX",
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "id": "in_17IOLQKaReE7xLUdCQW53FjQ",
+            "customer": "cus_7XTHkjYW7hakrU",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
-                        "amount": 999,
+                        "id": "sub_7XTI7W8CIY0DXL",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -403,36 +403,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPabDqWaXXl4",
-            "total": 999
+            "subscription": "sub_7XTI7W8CIY0DXL",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -440,11 +440,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
+                        "id": "sub_7XTI7W8CIY0DXL",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -452,27 +452,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -484,29 +484,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCynKaReE7xLUdhjiRodmo",
+        "path": "/v1/invoices/in_17IOLPKaReE7xLUd3jd9QmjK",
         "status": 200,
         "response": {
-            "id": "in_17GCynKaReE7xLUdhjiRodmo",
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "id": "in_17IOLPKaReE7xLUd3jd9QmjK",
+            "customer": "cus_7XTHkjYW7hakrU",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUDYQvLGYc6",
-                "subscription": "sub_7VDP47YSQKI8ud"
+                "customer": "cus_7XTHkjYW7hakrU",
+                "subscription": "sub_7XTHh8nw8chSad"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
-                        "amount": 999,
+                        "id": "sub_7XTHh8nw8chSad",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,29 +516,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDP47YSQKI8ud",
+            "subscription": "sub_7XTHh8nw8chSad",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -546,11 +546,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
+                        "id": "sub_7XTI7W8CIY0DXL",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -558,27 +558,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -590,16 +590,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDPabDqWaXXl4",
+                    "id": "sub_7XTI7W8CIY0DXL",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365279,
-                    "current_period_start": 1449686879,
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "current_period_end": 1452885620,
+                    "current_period_start": 1450207220,
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "metadata": {
                         "id": "0000000000000000000186cf"
                     },
@@ -607,27 +607,27 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 999
+                    "quantity": 100
                 },
                 {
-                    "id": "sub_7VDP47YSQKI8ud",
+                    "id": "sub_7XTHh8nw8chSad",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365277,
-                    "current_period_start": 1449686877,
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "current_period_end": 1452885619,
+                    "current_period_start": 1450207219,
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDP47YSQKI8ud"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTHh8nw8chSad"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ce"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -638,155 +638,66 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPI1RlxQ4P8P",
+            "id": "sub_7XTIlZXphAvwdS",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365282,
-            "current_period_start": 1449686882,
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "current_period_end": 1452885625,
+            "current_period_start": 1450207225,
+            "customer": "cus_7XTHkjYW7hakrU",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUDYQvLGYc6",
-                "subscription": "sub_7VDPI1RlxQ4P8P"
+                "customer": "cus_7XTHkjYW7hakrU",
+                "subscription": "sub_7XTIlZXphAvwdS"
             },
             "metadata": {
                 "id": "0000000000000000000186cd"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user145@me.com",
-            "metadata": {
-                "id": "0000000000000000000186cf"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPI1RlxQ4P8P",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365282,
-                        "current_period_start": 1449686882,
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDPI1RlxQ4P8P"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186cd"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDPabDqWaXXl4",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "metadata": {
-                            "id": "0000000000000000000186cf"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDP47YSQKI8ud",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186ce"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDPI1RlxQ4P8P",
+                    "id": "sub_7XTIlZXphAvwdS",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365282,
-                    "current_period_start": 1449686882,
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "current_period_end": 1452885625,
+                    "current_period_start": 1450207225,
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDPI1RlxQ4P8P"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTIlZXphAvwdS"
                     },
                     "metadata": {
                         "id": "0000000000000000000186cd"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDPabDqWaXXl4",
+                    "id": "sub_7XTI7W8CIY0DXL",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365279,
-                    "current_period_start": 1449686879,
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "current_period_end": 1452885620,
+                    "current_period_start": 1450207220,
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "metadata": {
                         "id": "0000000000000000000186cf"
                     },
@@ -794,27 +705,27 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 999
+                    "quantity": 100
                 },
                 {
-                    "id": "sub_7VDP47YSQKI8ud",
+                    "id": "sub_7XTHh8nw8chSad",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365277,
-                    "current_period_start": 1449686877,
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "current_period_end": 1452885619,
+                    "current_period_start": 1450207219,
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDP47YSQKI8ud"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTHh8nw8chSad"
                     },
                     "metadata": {
                         "id": "0000000000000000000186ce"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -825,14 +736,103 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6/subscriptions/sub_7VDPabDqWaXXl4",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "sub_7VDPabDqWaXXl4",
+            "id": "cus_7XTHkjYW7hakrU",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user45@me.com",
+            "metadata": {
+                "id": "0000000000000000000186cf"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTIlZXphAvwdS",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885625,
+                        "current_period_start": 1450207225,
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTIlZXphAvwdS"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186cd"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTI7W8CIY0DXL",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "metadata": {
+                            "id": "0000000000000000000186cf"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTHh8nw8chSad",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186ce"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU/subscriptions/sub_7XTI7W8CIY0DXL",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTI7W8CIY0DXL",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365279,
-            "current_period_start": 1449686879,
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "current_period_end": 1452885620,
+            "current_period_start": 1450207220,
+            "customer": "cus_7XTHkjYW7hakrU",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
@@ -840,7 +840,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
@@ -849,41 +849,41 @@
         "path": "/v1/invoices",
         "status": 200,
         "response": {
-            "id": "in_17GCywKaReE7xLUdKZ3PKEqr",
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "id": "in_17IOLYKaReE7xLUdnDWepi1v",
+            "customer": "cus_7XTHkjYW7hakrU",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCyvKaReE7xLUd2Bcm0Z0X",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLXKaReE7xLUdh8Vzo68I",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDPabDqWaXXl4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTI7W8CIY0DXL",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCyvKaReE7xLUdd78npVMx",
-                        "amount": 1798,
-                        "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLXKaReE7xLUdmi1WwUM0",
+                        "amount": 180,
+                        "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 1798,
-                        "subscription": "sub_7VDPabDqWaXXl4",
+                        "quantity": 180,
+                        "subscription": "sub_7XTI7W8CIY0DXL",
                         "type": "invoiceitem"
                     }
                 ],
                 "has_more": false
             },
             "paid": false,
-            "total": 799
+            "total": 80
         }
     },
     {
@@ -894,63 +894,63 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCywKaReE7xLUdKZ3PKEqr",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLYKaReE7xLUdnDWepi1v",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "lines": {
                         "data": [
                             {
-                                "id": "ii_17GCyvKaReE7xLUd2Bcm0Z0X",
-                                "amount": -999,
-                                "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLXKaReE7xLUdh8Vzo68I",
+                                "amount": -100,
+                                "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 999,
-                                "subscription": "sub_7VDPabDqWaXXl4",
+                                "quantity": 100,
+                                "subscription": "sub_7XTI7W8CIY0DXL",
                                 "type": "invoiceitem"
                             },
                             {
-                                "id": "ii_17GCyvKaReE7xLUdd78npVMx",
-                                "amount": 1798,
-                                "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLXKaReE7xLUdmi1WwUM0",
+                                "amount": 180,
+                                "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 1798,
-                                "subscription": "sub_7VDPabDqWaXXl4",
+                                "quantity": 180,
+                                "subscription": "sub_7XTI7W8CIY0DXL",
                                 "type": "invoiceitem"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": false,
-                    "total": 799
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCysKaReE7xLUdAVJS5v5H",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLVKaReE7xLUdB5gr5nPH",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDPI1RlxQ4P8P"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTIlZXphAvwdS"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPI1RlxQ4P8P",
-                                "amount": 999,
+                                "id": "sub_7XTIlZXphAvwdS",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cd"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -960,17 +960,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPI1RlxQ4P8P",
+                    "subscription": "sub_7XTIlZXphAvwdS",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCypKaReE7xLUd2ptZ1BhX",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLQKaReE7xLUdCQW53FjQ",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPabDqWaXXl4",
-                                "amount": 999,
+                                "id": "sub_7XTI7W8CIY0DXL",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cf"
                                 },
@@ -979,37 +979,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPabDqWaXXl4",
-                    "total": 999
+                    "subscription": "sub_7XTI7W8CIY0DXL",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCynKaReE7xLUdhjiRodmo",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLPKaReE7xLUd3jd9QmjK",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDP47YSQKI8ud"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTHh8nw8chSad"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP47YSQKI8ud",
-                                "amount": 999,
+                                "id": "sub_7XTHh8nw8chSad",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ce"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1019,7 +1019,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP47YSQKI8ud",
+                    "subscription": "sub_7XTHh8nw8chSad",
                     "total": 0
                 }
             ],
@@ -1029,22 +1029,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPUDYQvLGYc6",
+        "path": "/v1/customers/cus_7XTHkjYW7hakrU",
         "status": 200,
         "response": {
-            "id": "cus_7VDPUDYQvLGYc6",
+            "id": "cus_7XTHkjYW7hakrU",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user145@me.com",
+            "email": "user45@me.com",
             "metadata": {
                 "id": "0000000000000000000186cf"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCylKaReE7xLUd4WnpSJTw",
-                        "customer": "cus_7VDPUDYQvLGYc6"
+                        "id": "card_17IOLNKaReE7xLUd9h1tUuhs",
+                        "customer": "cus_7XTHkjYW7hakrU"
                     }
                 ],
                 "has_more": false
@@ -1052,11 +1052,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPabDqWaXXl4",
+                        "id": "sub_7XTI7W8CIY0DXL",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365279,
-                        "current_period_start": 1449686879,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885620,
+                        "current_period_start": 1450207220,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "metadata": {
                             "id": "0000000000000000000186cf"
                         },
@@ -1064,49 +1064,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDPI1RlxQ4P8P",
+                        "id": "sub_7XTIlZXphAvwdS",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365282,
-                        "current_period_start": 1449686882,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885625,
+                        "current_period_start": 1450207225,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDPI1RlxQ4P8P"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTIlZXphAvwdS"
                         },
                         "metadata": {
                             "id": "0000000000000000000186cd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDP47YSQKI8ud",
+                        "id": "sub_7XTHh8nw8chSad",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365277,
-                        "current_period_start": 1449686877,
-                        "customer": "cus_7VDPUDYQvLGYc6",
+                        "current_period_end": 1452885619,
+                        "current_period_start": 1450207219,
+                        "customer": "cus_7XTHkjYW7hakrU",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPUDYQvLGYc6",
-                            "subscription": "sub_7VDP47YSQKI8ud"
+                            "customer": "cus_7XTHkjYW7hakrU",
+                            "subscription": "sub_7XTHh8nw8chSad"
                         },
                         "metadata": {
                             "id": "0000000000000000000186ce"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1118,72 +1118,72 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCywKaReE7xLUdKZ3PKEqr",
+        "path": "/v1/invoices/in_17IOLYKaReE7xLUdnDWepi1v",
         "status": 200,
         "response": {
-            "id": "in_17GCywKaReE7xLUdKZ3PKEqr",
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "id": "in_17IOLYKaReE7xLUdnDWepi1v",
+            "customer": "cus_7XTHkjYW7hakrU",
             "lines": {
                 "data": [
                     {
-                        "id": "ii_17GCyvKaReE7xLUd2Bcm0Z0X",
-                        "amount": -999,
-                        "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLXKaReE7xLUdh8Vzo68I",
+                        "amount": -100,
+                        "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 999,
-                        "subscription": "sub_7VDPabDqWaXXl4",
+                        "quantity": 100,
+                        "subscription": "sub_7XTI7W8CIY0DXL",
                         "type": "invoiceitem"
                     },
                     {
-                        "id": "ii_17GCyvKaReE7xLUdd78npVMx",
-                        "amount": 1798,
-                        "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                        "id": "ii_17IOLXKaReE7xLUdmi1WwUM0",
+                        "amount": 180,
+                        "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                         "plan": {
                             "id": "incremental",
                             "amount": 1
                         },
                         "proration": true,
-                        "quantity": 1798,
-                        "subscription": "sub_7VDPabDqWaXXl4",
+                        "quantity": 180,
+                        "subscription": "sub_7XTI7W8CIY0DXL",
                         "type": "invoiceitem"
                     }
                 ],
                 "has_more": false
             },
             "paid": false,
-            "total": 799
+            "total": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCysKaReE7xLUdAVJS5v5H",
+        "path": "/v1/invoices/in_17IOLVKaReE7xLUdB5gr5nPH",
         "status": 200,
         "response": {
-            "id": "in_17GCysKaReE7xLUdAVJS5v5H",
-            "customer": "cus_7VDPUDYQvLGYc6",
+            "id": "in_17IOLVKaReE7xLUdB5gr5nPH",
+            "customer": "cus_7XTHkjYW7hakrU",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPUDYQvLGYc6",
-                "subscription": "sub_7VDPI1RlxQ4P8P"
+                "customer": "cus_7XTHkjYW7hakrU",
+                "subscription": "sub_7XTIlZXphAvwdS"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPI1RlxQ4P8P",
-                        "amount": 999,
+                        "id": "sub_7XTIlZXphAvwdS",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186cd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1193,7 +1193,7 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPI1RlxQ4P8P",
+            "subscription": "sub_7XTIlZXphAvwdS",
             "total": 0
         }
     },
@@ -1205,63 +1205,63 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCywKaReE7xLUdKZ3PKEqr",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLYKaReE7xLUdnDWepi1v",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "lines": {
                         "data": [
                             {
-                                "id": "ii_17GCyvKaReE7xLUd2Bcm0Z0X",
-                                "amount": -999,
-                                "description": "Unused time on 999 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLXKaReE7xLUdh8Vzo68I",
+                                "amount": -100,
+                                "description": "Unused time on 100 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 999,
-                                "subscription": "sub_7VDPabDqWaXXl4",
+                                "quantity": 100,
+                                "subscription": "sub_7XTI7W8CIY0DXL",
                                 "type": "invoiceitem"
                             },
                             {
-                                "id": "ii_17GCyvKaReE7xLUdd78npVMx",
-                                "amount": 1798,
-                                "description": "Remaining time on 1798 x Incremental after 09 Dec 2015",
+                                "id": "ii_17IOLXKaReE7xLUdmi1WwUM0",
+                                "amount": 180,
+                                "description": "Remaining time on 180 x Incremental after 15 Dec 2015",
                                 "plan": {
                                     "id": "incremental",
                                     "amount": 1
                                 },
                                 "proration": true,
-                                "quantity": 1798,
-                                "subscription": "sub_7VDPabDqWaXXl4",
+                                "quantity": 180,
+                                "subscription": "sub_7XTI7W8CIY0DXL",
                                 "type": "invoiceitem"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": false,
-                    "total": 799
+                    "total": 80
                 },
                 {
-                    "id": "in_17GCysKaReE7xLUdAVJS5v5H",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLVKaReE7xLUdB5gr5nPH",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDPI1RlxQ4P8P"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTIlZXphAvwdS"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPI1RlxQ4P8P",
-                                "amount": 999,
+                                "id": "sub_7XTIlZXphAvwdS",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cd"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1271,17 +1271,17 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPI1RlxQ4P8P",
+                    "subscription": "sub_7XTIlZXphAvwdS",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCypKaReE7xLUd2ptZ1BhX",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLQKaReE7xLUdCQW53FjQ",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPabDqWaXXl4",
-                                "amount": 999,
+                                "id": "sub_7XTI7W8CIY0DXL",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186cf"
                                 },
@@ -1290,37 +1290,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPabDqWaXXl4",
-                    "total": 999
+                    "subscription": "sub_7XTI7W8CIY0DXL",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCynKaReE7xLUdhjiRodmo",
-                    "customer": "cus_7VDPUDYQvLGYc6",
+                    "id": "in_17IOLPKaReE7xLUd3jd9QmjK",
+                    "customer": "cus_7XTHkjYW7hakrU",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPUDYQvLGYc6",
-                        "subscription": "sub_7VDP47YSQKI8ud"
+                        "customer": "cus_7XTHkjYW7hakrU",
+                        "subscription": "sub_7XTHh8nw8chSad"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDP47YSQKI8ud",
-                                "amount": 999,
+                                "id": "sub_7XTHh8nw8chSad",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186ce"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -1330,7 +1330,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDP47YSQKI8ud",
+                    "subscription": "sub_7XTHh8nw8chSad",
                     "total": 0
                 }
             ],
diff --git a/spec/fixtures/sub-test-28.json b/spec/fixtures/sub-test-28.json
index 548275604..c39a6cd97 100644
--- a/spec/fixtures/sub-test-28.json
+++ b/spec/fixtures/sub-test-28.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCz0KaReE7xLUdfGmoH6iD",
+            "id": "tok_17IOLcKaReE7xLUdNIKmyoTp",
             "card": {
-                "id": "card_17GCz0KaReE7xLUdbv6dUvYF"
+                "id": "card_17IOLcKaReE7xLUdtnTANBpE"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDPyzg6wmIScl",
+            "id": "cus_7XTIG0qu833nRd",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user146@me.com",
+            "email": "user46@me.com",
             "metadata": {
                 "id": "0000000000000000000186d0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz0KaReE7xLUdbv6dUvYF",
-                        "customer": "cus_7VDPyzg6wmIScl"
+                        "id": "card_17IOLcKaReE7xLUdtnTANBpE",
+                        "customer": "cus_7XTIG0qu833nRd"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPyzg6wmIScl",
+        "path": "/v1/customers/cus_7XTIG0qu833nRd",
         "status": 200,
         "response": {
-            "id": "cus_7VDPyzg6wmIScl",
+            "id": "cus_7XTIG0qu833nRd",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user146@me.com",
+            "email": "user46@me.com",
             "metadata": {
                 "id": "0000000000000000000186d0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz0KaReE7xLUdbv6dUvYF",
-                        "customer": "cus_7VDPyzg6wmIScl"
+                        "id": "card_17IOLcKaReE7xLUdtnTANBpE",
+                        "customer": "cus_7XTIG0qu833nRd"
                     }
                 ],
                 "has_more": false
@@ -71,22 +71,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPyzg6wmIScl",
+        "path": "/v1/customers/cus_7XTIG0qu833nRd",
         "status": 200,
         "response": {
-            "id": "cus_7VDPyzg6wmIScl",
+            "id": "cus_7XTIG0qu833nRd",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user146@me.com",
+            "email": "user46@me.com",
             "metadata": {
                 "id": "0000000000000000000186d0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz0KaReE7xLUdbv6dUvYF",
-                        "customer": "cus_7VDPyzg6wmIScl"
+                        "id": "card_17IOLcKaReE7xLUdtnTANBpE",
+                        "customer": "cus_7XTIG0qu833nRd"
                     }
                 ],
                 "has_more": false
@@ -99,14 +99,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPyzg6wmIScl/subscriptions",
+        "path": "/v1/customers/cus_7XTIG0qu833nRd/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPCLPadwxF7P",
+            "id": "sub_7XTIN4Bu7GXO4e",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365292,
-            "current_period_start": 1449686892,
-            "customer": "cus_7VDPyzg6wmIScl",
+            "current_period_end": 1452885634,
+            "current_period_start": 1450207234,
+            "customer": "cus_7XTIG0qu833nRd",
             "metadata": {
                 "id": "0000000000000000000186d0"
             },
diff --git a/spec/fixtures/sub-test-29.json b/spec/fixtures/sub-test-29.json
index a08c9bf22..8b6256583 100644
--- a/spec/fixtures/sub-test-29.json
+++ b/spec/fixtures/sub-test-29.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCz3KaReE7xLUd6y2AQlmf",
+            "id": "tok_17IOLfKaReE7xLUdjOD2zWIt",
             "card": {
-                "id": "card_17GCz3KaReE7xLUdormzFUHD"
+                "id": "card_17IOLfKaReE7xLUdg1ANroaI"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
+            "id": "cus_7XTIWPz6zZnE2a",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user148@me.com",
+            "email": "user48@me.com",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
+            "id": "cus_7XTIWPz6zZnE2a",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user148@me.com",
+            "email": "user48@me.com",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
                     }
                 ],
                 "has_more": false
@@ -71,7 +71,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -80,27 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDPg3LCQ5CzTP",
+            "id": "sub_7XTIQRccvvKPB1",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365296,
-            "current_period_start": 1449686896,
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "current_period_end": 1452885637,
+            "current_period_start": 1450207237,
+            "customer": "cus_7XTIWPz6zZnE2a",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPo3YNU8ZYnv",
-                "subscription": "sub_7VDPg3LCQ5CzTP"
+                "customer": "cus_7XTIWPz6zZnE2a",
+                "subscription": "sub_7XTIQRccvvKPB1"
             },
             "metadata": {
                 "id": "0000000000000000000186d1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,66 +108,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user148@me.com",
-            "metadata": {
-                "id": "0000000000000000000186d2"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPg3LCQ5CzTP",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365296,
-                        "current_period_start": 1449686896,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPo3YNU8ZYnv",
-                            "subscription": "sub_7VDPg3LCQ5CzTP"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186d1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDPO0Lo0o3MoJ",
+            "id": "sub_7XTImFPSztmw66",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365297,
-            "current_period_start": 1449686897,
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "current_period_end": 1452885639,
+            "current_period_start": 1450207239,
+            "customer": "cus_7XTIWPz6zZnE2a",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
@@ -175,7 +123,74 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTIWPz6zZnE2a",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user48@me.com",
+            "metadata": {
+                "id": "0000000000000000000186d2"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTImFPSztmw66",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885639,
+                        "current_period_start": 1450207239,
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "metadata": {
+                            "id": "0000000000000000000186d2"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTIQRccvvKPB1",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885637,
+                        "current_period_start": 1450207237,
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTIWPz6zZnE2a",
+                            "subscription": "sub_7XTIQRccvvKPB1"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186d1"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -186,13 +201,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCz7KaReE7xLUdiVEGMsR1",
-                    "customer": "cus_7VDPo3YNU8ZYnv",
+                    "id": "in_17IOLjKaReE7xLUdug5l1IIm",
+                    "customer": "cus_7XTIWPz6zZnE2a",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPO0Lo0o3MoJ",
-                                "amount": 999,
+                                "id": "sub_7XTImFPSztmw66",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d2"
                                 },
@@ -201,37 +216,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 999,
+                                "quantity": 100,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPO0Lo0o3MoJ",
-                    "total": 999
+                    "subscription": "sub_7XTImFPSztmw66",
+                    "total": 100
                 },
                 {
-                    "id": "in_17GCz6KaReE7xLUd2J7e0xQ3",
-                    "customer": "cus_7VDPo3YNU8ZYnv",
+                    "id": "in_17IOLhKaReE7xLUd7IxcLZoW",
+                    "customer": "cus_7XTIWPz6zZnE2a",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPo3YNU8ZYnv",
-                        "subscription": "sub_7VDPg3LCQ5CzTP"
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "subscription": "sub_7XTIQRccvvKPB1"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDPg3LCQ5CzTP",
-                                "amount": 999,
+                                "id": "sub_7XTIQRccvvKPB1",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d1"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -241,7 +256,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDPg3LCQ5CzTP",
+                    "subscription": "sub_7XTIQRccvvKPB1",
                     "total": 0
                 }
             ],
@@ -251,22 +266,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
+            "id": "cus_7XTIWPz6zZnE2a",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user148@me.com",
+            "email": "user48@me.com",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
                     }
                 ],
                 "has_more": false
@@ -274,11 +289,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPO0Lo0o3MoJ",
+                        "id": "sub_7XTImFPSztmw66",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365297,
-                        "current_period_start": 1449686897,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885639,
+                        "current_period_start": 1450207239,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "metadata": {
                             "id": "0000000000000000000186d2"
                         },
@@ -286,27 +301,94 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPg3LCQ5CzTP",
+                        "id": "sub_7XTIQRccvvKPB1",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365296,
-                        "current_period_start": 1449686896,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885637,
+                        "current_period_start": 1450207237,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPo3YNU8ZYnv",
-                            "subscription": "sub_7VDPg3LCQ5CzTP"
+                            "customer": "cus_7XTIWPz6zZnE2a",
+                            "subscription": "sub_7XTIQRccvvKPB1"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTIWPz6zZnE2a",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user48@me.com",
+            "metadata": {
+                "id": "0000000000000000000186d2"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTImFPSztmw66",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885639,
+                        "current_period_start": 1450207239,
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "metadata": {
+                            "id": "0000000000000000000186d2"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 100
+                    },
+                    {
+                        "id": "sub_7XTIQRccvvKPB1",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885637,
+                        "current_period_start": 1450207237,
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTIWPz6zZnE2a",
+                            "subscription": "sub_7XTIQRccvvKPB1"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186d1"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -318,16 +400,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCz7KaReE7xLUdiVEGMsR1",
+        "path": "/v1/invoices/in_17IOLjKaReE7xLUdug5l1IIm",
         "status": 200,
         "response": {
-            "id": "in_17GCz7KaReE7xLUdiVEGMsR1",
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "id": "in_17IOLjKaReE7xLUdug5l1IIm",
+            "customer": "cus_7XTIWPz6zZnE2a",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPO0Lo0o3MoJ",
-                        "amount": 999,
+                        "id": "sub_7XTImFPSztmw66",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d2"
                         },
@@ -336,36 +418,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 999,
+                        "quantity": 100,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPO0Lo0o3MoJ",
-            "total": 999
+            "subscription": "sub_7XTImFPSztmw66",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
+            "id": "cus_7XTIWPz6zZnE2a",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user148@me.com",
+            "email": "user48@me.com",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
+                        "id": "card_17IOLfKaReE7xLUdg1ANroaI",
+                        "customer": "cus_7XTIWPz6zZnE2a"
                     }
                 ],
                 "has_more": false
@@ -373,11 +455,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPO0Lo0o3MoJ",
+                        "id": "sub_7XTImFPSztmw66",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365297,
-                        "current_period_start": 1449686897,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885639,
+                        "current_period_start": 1450207239,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "metadata": {
                             "id": "0000000000000000000186d2"
                         },
@@ -385,27 +467,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPg3LCQ5CzTP",
+                        "id": "sub_7XTIQRccvvKPB1",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365296,
-                        "current_period_start": 1449686896,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885637,
+                        "current_period_start": 1450207237,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPo3YNU8ZYnv",
-                            "subscription": "sub_7VDPg3LCQ5CzTP"
+                            "customer": "cus_7XTIWPz6zZnE2a",
+                            "subscription": "sub_7XTIQRccvvKPB1"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -417,96 +499,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "path": "/v1/invoices/in_17IOLhKaReE7xLUd7IxcLZoW",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user148@me.com",
-            "metadata": {
-                "id": "0000000000000000000186d2"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCz3KaReE7xLUdormzFUHD",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDPO0Lo0o3MoJ",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365297,
-                        "current_period_start": 1449686897,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
-                        "metadata": {
-                            "id": "0000000000000000000186d2"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 999
-                    },
-                    {
-                        "id": "sub_7VDPg3LCQ5CzTP",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365296,
-                        "current_period_start": 1449686896,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDPo3YNU8ZYnv",
-                            "subscription": "sub_7VDPg3LCQ5CzTP"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186d1"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCz6KaReE7xLUd2J7e0xQ3",
-        "status": 200,
-        "response": {
-            "id": "in_17GCz6KaReE7xLUd2J7e0xQ3",
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "id": "in_17IOLhKaReE7xLUd7IxcLZoW",
+            "customer": "cus_7XTIWPz6zZnE2a",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPo3YNU8ZYnv",
-                "subscription": "sub_7VDPg3LCQ5CzTP"
+                "customer": "cus_7XTIWPz6zZnE2a",
+                "subscription": "sub_7XTIQRccvvKPB1"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDPg3LCQ5CzTP",
-                        "amount": 999,
+                        "id": "sub_7XTIQRccvvKPB1",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -516,21 +531,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDPg3LCQ5CzTP",
+            "subscription": "sub_7XTIQRccvvKPB1",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions/sub_7VDPO0Lo0o3MoJ",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions/sub_7XTImFPSztmw66",
         "status": 200,
         "response": {
-            "id": "sub_7VDPO0Lo0o3MoJ",
+            "id": "sub_7XTImFPSztmw66",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365297,
-            "current_period_start": 1449686897,
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "current_period_end": 1452885639,
+            "current_period_start": 1450207239,
+            "customer": "cus_7XTIWPz6zZnE2a",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
@@ -538,33 +553,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 999
+            "quantity": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions/sub_7VDPg3LCQ5CzTP",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions/sub_7XTIQRccvvKPB1",
         "status": 200,
         "response": {
-            "id": "sub_7VDPg3LCQ5CzTP",
+            "id": "sub_7XTIQRccvvKPB1",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365296,
-            "current_period_start": 1449686896,
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "current_period_end": 1452885637,
+            "current_period_start": 1450207237,
+            "customer": "cus_7XTIWPz6zZnE2a",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDPo3YNU8ZYnv",
-                "subscription": "sub_7VDPg3LCQ5CzTP"
+                "customer": "cus_7XTIWPz6zZnE2a",
+                "subscription": "sub_7XTIQRccvvKPB1"
             },
             "metadata": {
                 "id": "0000000000000000000186d1"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -575,9 +590,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCzBKaReE7xLUdbvnLBdzm",
+            "id": "tok_17IOLnKaReE7xLUdZbfYdcNI",
             "card": {
-                "id": "card_17GCzBKaReE7xLUdrGaHl1xn"
+                "id": "card_17IOLnKaReE7xLUdC6sdISks"
             },
             "type": "card"
         }
@@ -585,22 +600,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a",
         "status": 200,
         "response": {
-            "id": "cus_7VDPo3YNU8ZYnv",
+            "id": "cus_7XTIWPz6zZnE2a",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user148@me.com",
+            "email": "user48@me.com",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzBKaReE7xLUdrGaHl1xn",
-                        "customer": "cus_7VDPo3YNU8ZYnv"
+                        "id": "card_17IOLnKaReE7xLUdC6sdISks",
+                        "customer": "cus_7XTIWPz6zZnE2a"
                     }
                 ],
                 "has_more": false
@@ -608,11 +623,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDPO0Lo0o3MoJ",
+                        "id": "sub_7XTImFPSztmw66",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365297,
-                        "current_period_start": 1449686897,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885639,
+                        "current_period_start": 1450207239,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "metadata": {
                             "id": "0000000000000000000186d2"
                         },
@@ -620,27 +635,27 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 999
+                        "quantity": 100
                     },
                     {
-                        "id": "sub_7VDPg3LCQ5CzTP",
+                        "id": "sub_7XTIQRccvvKPB1",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365296,
-                        "current_period_start": 1449686896,
-                        "customer": "cus_7VDPo3YNU8ZYnv",
+                        "current_period_end": 1452885637,
+                        "current_period_start": 1450207237,
+                        "customer": "cus_7XTIWPz6zZnE2a",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDPo3YNU8ZYnv",
-                            "subscription": "sub_7VDPg3LCQ5CzTP"
+                            "customer": "cus_7XTIWPz6zZnE2a",
+                            "subscription": "sub_7XTIQRccvvKPB1"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d1"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -652,20 +667,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQOwKvASnwSe",
+            "id": "sub_7XTIwI7JeLnK18",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365302,
-            "current_period_start": 1449686902,
-            "customer": "cus_7VDPo3YNU8ZYnv",
+            "current_period_end": 1452885645,
+            "current_period_start": 1450207245,
+            "customer": "cus_7XTIWPz6zZnE2a",
             "metadata": {
                 "id": "0000000000000000000186d2"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -673,31 +688,31 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDPo3YNU8ZYnv/subscriptions",
+        "path": "/v1/customers/cus_7XTIWPz6zZnE2a/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQOwKvASnwSe",
+                    "id": "sub_7XTIwI7JeLnK18",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365302,
-                    "current_period_start": 1449686902,
-                    "customer": "cus_7VDPo3YNU8ZYnv",
+                    "current_period_end": 1452885645,
+                    "current_period_start": 1450207245,
+                    "customer": "cus_7XTIWPz6zZnE2a",
                     "metadata": {
                         "id": "0000000000000000000186d2"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDPO0Lo0o3MoJ",
+                    "id": "sub_7XTImFPSztmw66",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365297,
-                    "current_period_start": 1449686897,
-                    "customer": "cus_7VDPo3YNU8ZYnv",
+                    "current_period_end": 1452885639,
+                    "current_period_start": 1450207239,
+                    "customer": "cus_7XTIWPz6zZnE2a",
                     "metadata": {
                         "id": "0000000000000000000186d2"
                     },
@@ -705,27 +720,27 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 999
+                    "quantity": 100
                 },
                 {
-                    "id": "sub_7VDPg3LCQ5CzTP",
+                    "id": "sub_7XTIQRccvvKPB1",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365296,
-                    "current_period_start": 1449686896,
-                    "customer": "cus_7VDPo3YNU8ZYnv",
+                    "current_period_end": 1452885637,
+                    "current_period_start": 1450207237,
+                    "customer": "cus_7XTIWPz6zZnE2a",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDPo3YNU8ZYnv",
-                        "subscription": "sub_7VDPg3LCQ5CzTP"
+                        "customer": "cus_7XTIWPz6zZnE2a",
+                        "subscription": "sub_7XTIQRccvvKPB1"
                     },
                     "metadata": {
                         "id": "0000000000000000000186d1"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
diff --git a/spec/fixtures/sub-test-30.json b/spec/fixtures/sub-test-30.json
index 222ffeb9e..b6eaab71a 100644
--- a/spec/fixtures/sub-test-30.json
+++ b/spec/fixtures/sub-test-30.json
@@ -5,11 +5,11 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDQwLJfXCoq4W",
+            "id": "cus_7XTIYq73SHazfh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user149@me.com",
+            "email": "user49@me.com",
             "metadata": {
                 "id": "0000000000000000000186d3"
             },
@@ -24,14 +24,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQwLJfXCoq4W",
+        "path": "/v1/customers/cus_7XTIYq73SHazfh",
         "status": 200,
         "response": {
-            "id": "cus_7VDQwLJfXCoq4W",
+            "id": "cus_7XTIYq73SHazfh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user149@me.com",
+            "email": "user49@me.com",
             "metadata": {
                 "id": "0000000000000000000186d3"
             },
@@ -46,27 +46,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQwLJfXCoq4W/subscriptions",
+        "path": "/v1/customers/cus_7XTIYq73SHazfh/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQkxjwBQw0Qx",
+            "id": "sub_7XTIiX8iKMqTtn",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365304,
-            "current_period_start": 1449686904,
-            "customer": "cus_7VDQwLJfXCoq4W",
+            "current_period_end": 1452885648,
+            "current_period_start": 1450207248,
+            "customer": "cus_7XTIYq73SHazfh",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQwLJfXCoq4W",
-                "subscription": "sub_7VDQkxjwBQw0Qx"
+                "customer": "cus_7XTIYq73SHazfh",
+                "subscription": "sub_7XTIiX8iKMqTtn"
             },
             "metadata": {
                 "id": "0000000000000000000186d3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -77,9 +77,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCzFKaReE7xLUd8H2nXt45",
+            "id": "tok_17IOLtKaReE7xLUdfdyfvVaq",
             "card": {
-                "id": "card_17GCzFKaReE7xLUdZfftdcPf"
+                "id": "card_17IOLtKaReE7xLUdfhFhrAWf"
             },
             "type": "card"
         }
@@ -87,14 +87,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQwLJfXCoq4W",
+        "path": "/v1/customers/cus_7XTIYq73SHazfh",
         "status": 200,
         "response": {
-            "id": "cus_7VDQwLJfXCoq4W",
+            "id": "cus_7XTIYq73SHazfh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user149@me.com",
+            "email": "user49@me.com",
             "metadata": {
                 "id": "0000000000000000000186d3"
             },
@@ -104,24 +104,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQkxjwBQw0Qx",
+                        "id": "sub_7XTIiX8iKMqTtn",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365304,
-                        "current_period_start": 1449686904,
-                        "customer": "cus_7VDQwLJfXCoq4W",
+                        "current_period_end": 1452885648,
+                        "current_period_start": 1450207248,
+                        "customer": "cus_7XTIYq73SHazfh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQwLJfXCoq4W",
-                            "subscription": "sub_7VDQkxjwBQw0Qx"
+                            "customer": "cus_7XTIYq73SHazfh",
+                            "subscription": "sub_7XTIiX8iKMqTtn"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -133,14 +133,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQwLJfXCoq4W",
+        "path": "/v1/customers/cus_7XTIYq73SHazfh",
         "status": 200,
         "response": {
-            "id": "cus_7VDQwLJfXCoq4W",
+            "id": "cus_7XTIYq73SHazfh",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user149@me.com",
+            "email": "user49@me.com",
             "metadata": {
                 "id": "0000000000000000000186d3"
             },
@@ -150,24 +150,24 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQkxjwBQw0Qx",
+                        "id": "sub_7XTIiX8iKMqTtn",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365304,
-                        "current_period_start": 1449686904,
-                        "customer": "cus_7VDQwLJfXCoq4W",
+                        "current_period_end": 1452885648,
+                        "current_period_start": 1450207248,
+                        "customer": "cus_7XTIYq73SHazfh",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQwLJfXCoq4W",
-                            "subscription": "sub_7VDQkxjwBQw0Qx"
+                            "customer": "cus_7XTIYq73SHazfh",
+                            "subscription": "sub_7XTIiX8iKMqTtn"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,19 +182,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDQlxv5S0eBtk",
+            "id": "cus_7XTIuGhBI2HVcE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user150@me.com",
+            "email": "user50@me.com",
             "metadata": {
                 "id": "0000000000000000000186d4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzFKaReE7xLUdZfftdcPf",
-                        "customer": "cus_7VDQlxv5S0eBtk"
+                        "id": "card_17IOLtKaReE7xLUdfhFhrAWf",
+                        "customer": "cus_7XTIuGhBI2HVcE"
                     }
                 ],
                 "has_more": false
@@ -207,22 +207,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQlxv5S0eBtk",
+        "path": "/v1/customers/cus_7XTIuGhBI2HVcE",
         "status": 200,
         "response": {
-            "id": "cus_7VDQlxv5S0eBtk",
+            "id": "cus_7XTIuGhBI2HVcE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user150@me.com",
+            "email": "user50@me.com",
             "metadata": {
                 "id": "0000000000000000000186d4"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzFKaReE7xLUdZfftdcPf",
-                        "customer": "cus_7VDQlxv5S0eBtk"
+                        "id": "card_17IOLtKaReE7xLUdfhFhrAWf",
+                        "customer": "cus_7XTIuGhBI2HVcE"
                     }
                 ],
                 "has_more": false
@@ -235,14 +235,42 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQlxv5S0eBtk/subscriptions",
+        "path": "/v1/customers/cus_7XTIuGhBI2HVcE",
         "status": 200,
         "response": {
-            "id": "sub_7VDQXC0aQzjUhm",
+            "id": "cus_7XTIuGhBI2HVcE",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user50@me.com",
+            "metadata": {
+                "id": "0000000000000000000186d4"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOLtKaReE7xLUdfhFhrAWf",
+                        "customer": "cus_7XTIuGhBI2HVcE"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTIuGhBI2HVcE/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTICzapjPhmAB",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365307,
-            "current_period_start": 1449686907,
-            "customer": "cus_7VDQlxv5S0eBtk",
+            "current_period_end": 1452885652,
+            "current_period_start": 1450207252,
+            "customer": "cus_7XTIuGhBI2HVcE",
             "metadata": {
                 "id": "0000000000000000000186d4"
             },
diff --git a/spec/fixtures/sub-test-31.json b/spec/fixtures/sub-test-31.json
index e1ec8a1f0..5150a7403 100644
--- a/spec/fixtures/sub-test-31.json
+++ b/spec/fixtures/sub-test-31.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCzIKaReE7xLUdpd3xMQM2",
+            "id": "tok_17IOLxKaReE7xLUdvww3J7A5",
             "card": {
-                "id": "card_17GCzIKaReE7xLUdoKnZvG6Z"
+                "id": "card_17IOLxKaReE7xLUd7WeEdq6f"
             },
             "type": "card"
         }
@@ -18,19 +18,47 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
+            "id": "cus_7XTI61m5RF7laL",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user153@me.com",
+            "email": "user53@me.com",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTI61m5RF7laL",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user53@me.com",
+            "metadata": {
+                "id": "0000000000000000000186d7"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
                     }
                 ],
                 "has_more": false
@@ -43,7 +71,7 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions",
         "status": 200,
         "response": {
             "has_more": false
@@ -52,55 +80,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user153@me.com",
-            "metadata": {
-                "id": "0000000000000000000186d7"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQN2xmA3qRv1",
+            "id": "sub_7XTIkUX57VHhHq",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365309,
-            "current_period_start": 1449686909,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885656,
+            "current_period_start": 1450207256,
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQN2xmA3qRv1"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTIkUX57VHhHq"
             },
             "metadata": {
                 "id": "0000000000000000000186d5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -108,29 +108,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQN2xmA3qRv1",
+                    "id": "sub_7XTIkUX57VHhHq",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365309,
-                    "current_period_start": 1449686909,
-                    "customer": "cus_7VDQreyG0YOAk3",
+                    "current_period_end": 1452885656,
+                    "current_period_start": 1450207256,
+                    "customer": "cus_7XTI61m5RF7laL",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQreyG0YOAk3",
-                        "subscription": "sub_7VDQN2xmA3qRv1"
+                        "customer": "cus_7XTI61m5RF7laL",
+                        "subscription": "sub_7XTIkUX57VHhHq"
                     },
                     "metadata": {
                         "id": "0000000000000000000186d5"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -141,27 +141,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQ2wKmp32Bog",
+            "id": "sub_7XTICuoNYZd9Kj",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365311,
-            "current_period_start": 1449686911,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885658,
+            "current_period_start": 1450207258,
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQ2wKmp32Bog"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTICuoNYZd9Kj"
             },
             "metadata": {
                 "id": "0000000000000000000186d6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -169,22 +169,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
+            "id": "cus_7XTI61m5RF7laL",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user153@me.com",
+            "email": "user53@me.com",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
                     }
                 ],
                 "has_more": false
@@ -192,46 +192,46 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQ2wKmp32Bog",
+                        "id": "sub_7XTICuoNYZd9Kj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365311,
-                        "current_period_start": 1449686911,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885658,
+                        "current_period_start": 1450207258,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQ2wKmp32Bog"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTICuoNYZd9Kj"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQN2xmA3qRv1",
+                        "id": "sub_7XTIkUX57VHhHq",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365309,
-                        "current_period_start": 1449686909,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885656,
+                        "current_period_start": 1450207256,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQN2xmA3qRv1"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTIkUX57VHhHq"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -243,14 +243,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQDLhx5W5nrE",
+            "id": "sub_7XTIYiQCfgiCD3",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365312,
-            "current_period_start": 1449686912,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885660,
+            "current_period_start": 1450207260,
+            "customer": "cus_7XTI61m5RF7laL",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
@@ -258,7 +258,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
@@ -269,13 +269,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCzMKaReE7xLUdi37Cczto",
-                    "customer": "cus_7VDQreyG0YOAk3",
+                    "id": "in_17IOM4KaReE7xLUdNu0Kjk3I",
+                    "customer": "cus_7XTI61m5RF7laL",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQDLhx5W5nrE",
-                                "amount": 1798,
+                                "id": "sub_7XTIYiQCfgiCD3",
+                                "amount": 180,
                                 "metadata": {
                                     "id": "0000000000000000000186d7"
                                 },
@@ -284,37 +284,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 1798,
+                                "quantity": 180,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQDLhx5W5nrE",
-                    "total": 1798
+                    "subscription": "sub_7XTIYiQCfgiCD3",
+                    "total": 180
                 },
                 {
-                    "id": "in_17GCzLKaReE7xLUdL9gwdOLR",
-                    "customer": "cus_7VDQreyG0YOAk3",
+                    "id": "in_17IOM2KaReE7xLUdG9safMv7",
+                    "customer": "cus_7XTI61m5RF7laL",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQreyG0YOAk3",
-                        "subscription": "sub_7VDQ2wKmp32Bog"
+                        "customer": "cus_7XTI61m5RF7laL",
+                        "subscription": "sub_7XTICuoNYZd9Kj"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQ2wKmp32Bog",
-                                "amount": 999,
+                                "id": "sub_7XTICuoNYZd9Kj",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d6"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -324,30 +324,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQ2wKmp32Bog",
+                    "subscription": "sub_7XTICuoNYZd9Kj",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzJKaReE7xLUdLZGrlA16",
-                    "customer": "cus_7VDQreyG0YOAk3",
+                    "id": "in_17IOM0KaReE7xLUdiwwkZzKW",
+                    "customer": "cus_7XTI61m5RF7laL",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQreyG0YOAk3",
-                        "subscription": "sub_7VDQN2xmA3qRv1"
+                        "customer": "cus_7XTI61m5RF7laL",
+                        "subscription": "sub_7XTIkUX57VHhHq"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQN2xmA3qRv1",
-                                "amount": 999,
+                                "id": "sub_7XTIkUX57VHhHq",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d5"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -357,7 +357,7 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQN2xmA3qRv1",
+                    "subscription": "sub_7XTIkUX57VHhHq",
                     "total": 0
                 }
             ],
@@ -367,22 +367,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
+            "id": "cus_7XTI61m5RF7laL",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user153@me.com",
+            "email": "user53@me.com",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
                     }
                 ],
                 "has_more": false
@@ -390,11 +390,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQDLhx5W5nrE",
+                        "id": "sub_7XTIYiQCfgiCD3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365312,
-                        "current_period_start": 1449686912,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885660,
+                        "current_period_start": 1450207260,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "metadata": {
                             "id": "0000000000000000000186d7"
                         },
@@ -402,49 +402,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDQ2wKmp32Bog",
+                        "id": "sub_7XTICuoNYZd9Kj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365311,
-                        "current_period_start": 1449686911,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885658,
+                        "current_period_start": 1450207258,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQ2wKmp32Bog"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTICuoNYZd9Kj"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQN2xmA3qRv1",
+                        "id": "sub_7XTIkUX57VHhHq",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365309,
-                        "current_period_start": 1449686909,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885656,
+                        "current_period_start": 1450207256,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQN2xmA3qRv1"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTIkUX57VHhHq"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -456,22 +456,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
+            "id": "cus_7XTI61m5RF7laL",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user153@me.com",
+            "email": "user53@me.com",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
                     }
                 ],
                 "has_more": false
@@ -479,11 +479,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQDLhx5W5nrE",
+                        "id": "sub_7XTIYiQCfgiCD3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365312,
-                        "current_period_start": 1449686912,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885660,
+                        "current_period_start": 1450207260,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "metadata": {
                             "id": "0000000000000000000186d7"
                         },
@@ -491,49 +491,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDQ2wKmp32Bog",
+                        "id": "sub_7XTICuoNYZd9Kj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365311,
-                        "current_period_start": 1449686911,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885658,
+                        "current_period_start": 1450207258,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQ2wKmp32Bog"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTICuoNYZd9Kj"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQN2xmA3qRv1",
+                        "id": "sub_7XTIkUX57VHhHq",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365309,
-                        "current_period_start": 1449686909,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885656,
+                        "current_period_start": 1450207256,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQN2xmA3qRv1"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTIkUX57VHhHq"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -545,16 +545,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzMKaReE7xLUdi37Cczto",
+        "path": "/v1/invoices/in_17IOM4KaReE7xLUdNu0Kjk3I",
         "status": 200,
         "response": {
-            "id": "in_17GCzMKaReE7xLUdi37Cczto",
-            "customer": "cus_7VDQreyG0YOAk3",
+            "id": "in_17IOM4KaReE7xLUdNu0Kjk3I",
+            "customer": "cus_7XTI61m5RF7laL",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQDLhx5W5nrE",
-                        "amount": 1798,
+                        "id": "sub_7XTIYiQCfgiCD3",
+                        "amount": 180,
                         "metadata": {
                             "id": "0000000000000000000186d7"
                         },
@@ -563,36 +563,36 @@
                             "amount": 1
                         },
                         "proration": false,
-                        "quantity": 1798,
+                        "quantity": 180,
                         "type": "subscription"
                     }
                 ],
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQDLhx5W5nrE",
-            "total": 1798
+            "subscription": "sub_7XTIYiQCfgiCD3",
+            "total": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL",
         "status": 200,
         "response": {
-            "id": "cus_7VDQreyG0YOAk3",
+            "id": "cus_7XTI61m5RF7laL",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user153@me.com",
+            "email": "user53@me.com",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzIKaReE7xLUdoKnZvG6Z",
-                        "customer": "cus_7VDQreyG0YOAk3"
+                        "id": "card_17IOLxKaReE7xLUd7WeEdq6f",
+                        "customer": "cus_7XTI61m5RF7laL"
                     }
                 ],
                 "has_more": false
@@ -600,11 +600,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQDLhx5W5nrE",
+                        "id": "sub_7XTIYiQCfgiCD3",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365312,
-                        "current_period_start": 1449686912,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885660,
+                        "current_period_start": 1450207260,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "metadata": {
                             "id": "0000000000000000000186d7"
                         },
@@ -612,49 +612,49 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1798
+                        "quantity": 180
                     },
                     {
-                        "id": "sub_7VDQ2wKmp32Bog",
+                        "id": "sub_7XTICuoNYZd9Kj",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365311,
-                        "current_period_start": 1449686911,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885658,
+                        "current_period_start": 1450207258,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQ2wKmp32Bog"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTICuoNYZd9Kj"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQN2xmA3qRv1",
+                        "id": "sub_7XTIkUX57VHhHq",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365309,
-                        "current_period_start": 1449686909,
-                        "customer": "cus_7VDQreyG0YOAk3",
+                        "current_period_end": 1452885656,
+                        "current_period_start": 1450207256,
+                        "customer": "cus_7XTI61m5RF7laL",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQreyG0YOAk3",
-                            "subscription": "sub_7VDQN2xmA3qRv1"
+                            "customer": "cus_7XTI61m5RF7laL",
+                            "subscription": "sub_7XTIkUX57VHhHq"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -666,29 +666,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzLKaReE7xLUdL9gwdOLR",
+        "path": "/v1/invoices/in_17IOM2KaReE7xLUdG9safMv7",
         "status": 200,
         "response": {
-            "id": "in_17GCzLKaReE7xLUdL9gwdOLR",
-            "customer": "cus_7VDQreyG0YOAk3",
+            "id": "in_17IOM2KaReE7xLUdG9safMv7",
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQ2wKmp32Bog"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTICuoNYZd9Kj"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQ2wKmp32Bog",
-                        "amount": 999,
+                        "id": "sub_7XTICuoNYZd9Kj",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d6"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -698,36 +698,36 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQ2wKmp32Bog",
+            "subscription": "sub_7XTICuoNYZd9Kj",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzJKaReE7xLUdLZGrlA16",
+        "path": "/v1/invoices/in_17IOM0KaReE7xLUdiwwkZzKW",
         "status": 200,
         "response": {
-            "id": "in_17GCzJKaReE7xLUdLZGrlA16",
-            "customer": "cus_7VDQreyG0YOAk3",
+            "id": "in_17IOM0KaReE7xLUdiwwkZzKW",
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQN2xmA3qRv1"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTIkUX57VHhHq"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQN2xmA3qRv1",
-                        "amount": 999,
+                        "id": "sub_7XTIkUX57VHhHq",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d5"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -737,21 +737,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQN2xmA3qRv1",
+            "subscription": "sub_7XTIkUX57VHhHq",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions/sub_7VDQDLhx5W5nrE",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions/sub_7XTIYiQCfgiCD3",
         "status": 200,
         "response": {
-            "id": "sub_7VDQDLhx5W5nrE",
+            "id": "sub_7XTIYiQCfgiCD3",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365312,
-            "current_period_start": 1449686912,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885660,
+            "current_period_start": 1450207260,
+            "customer": "cus_7XTI61m5RF7laL",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
@@ -759,33 +759,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions/sub_7VDQ2wKmp32Bog",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions/sub_7XTICuoNYZd9Kj",
         "status": 200,
         "response": {
-            "id": "sub_7VDQ2wKmp32Bog",
+            "id": "sub_7XTICuoNYZd9Kj",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365311,
-            "current_period_start": 1449686911,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885658,
+            "current_period_start": 1450207258,
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQ2wKmp32Bog"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTICuoNYZd9Kj"
             },
             "metadata": {
                 "id": "0000000000000000000186d6"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -793,14 +793,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions/sub_7VDQDLhx5W5nrE",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions/sub_7XTIYiQCfgiCD3",
         "status": 200,
         "response": {
-            "id": "sub_7VDQDLhx5W5nrE",
+            "id": "sub_7XTIYiQCfgiCD3",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365312,
-            "current_period_start": 1449686912,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885660,
+            "current_period_start": 1450207260,
+            "customer": "cus_7XTI61m5RF7laL",
             "metadata": {
                 "id": "0000000000000000000186d7"
             },
@@ -808,33 +808,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1798
+            "quantity": 180
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQreyG0YOAk3/subscriptions/sub_7VDQN2xmA3qRv1",
+        "path": "/v1/customers/cus_7XTI61m5RF7laL/subscriptions/sub_7XTIkUX57VHhHq",
         "status": 200,
         "response": {
-            "id": "sub_7VDQN2xmA3qRv1",
+            "id": "sub_7XTIkUX57VHhHq",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365309,
-            "current_period_start": 1449686909,
-            "customer": "cus_7VDQreyG0YOAk3",
+            "current_period_end": 1452885656,
+            "current_period_start": 1450207256,
+            "customer": "cus_7XTI61m5RF7laL",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQreyG0YOAk3",
-                "subscription": "sub_7VDQN2xmA3qRv1"
+                "customer": "cus_7XTI61m5RF7laL",
+                "subscription": "sub_7XTIkUX57VHhHq"
             },
             "metadata": {
                 "id": "0000000000000000000186d5"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
diff --git a/spec/fixtures/sub-test-32.json b/spec/fixtures/sub-test-32.json
index 74ebf3aa1..3713dcc8c 100644
--- a/spec/fixtures/sub-test-32.json
+++ b/spec/fixtures/sub-test-32.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCzRKaReE7xLUdtc6sLdyQ",
+            "id": "tok_17IOMAKaReE7xLUdOZZUi5yM",
             "card": {
-                "id": "card_17GCzQKaReE7xLUd4kDDn4Fh"
+                "id": "card_17IOMAKaReE7xLUdq71byow9"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -71,88 +71,43 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQqnNzHi02T7",
+            "id": "sub_7XTIVho90wZ0EA",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365318,
-            "current_period_start": 1449686918,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885667,
+            "current_period_start": 1450207267,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user156@me.com",
-            "metadata": {
-                "id": "0000000000000000000186da"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQqnNzHi02T7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -160,17 +115,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +137,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -205,17 +160,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -227,22 +182,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQqnNzHi02T7",
+                    "id": "sub_7XTIVho90wZ0EA",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365318,
-                    "current_period_start": 1449686918,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885667,
+                    "current_period_start": 1450207267,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -253,27 +208,72 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "sub_7VDQAGb91sokrC",
+            "id": "cus_7XTI7OtNzsUxmY",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user56@me.com",
+            "metadata": {
+                "id": "0000000000000000000186da"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTIVho90wZ0EA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTIYZBmGU4c3H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365321,
-            "current_period_start": 1449686921,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885670,
+            "current_period_start": 1450207270,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQAGb91sokrC"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIYZBmGU4c3H"
             },
             "metadata": {
                 "id": "0000000000000000000186d8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -281,44 +281,44 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQAGb91sokrC",
+                    "id": "sub_7XTIYZBmGU4c3H",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365321,
-                    "current_period_start": 1449686921,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885670,
+                    "current_period_start": 1450207270,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "subscription": "sub_7VDQAGb91sokrC"
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "subscription": "sub_7XTIYZBmGU4c3H"
                     },
                     "metadata": {
                         "id": "0000000000000000000186d8"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQqnNzHi02T7",
+                    "id": "sub_7XTIVho90wZ0EA",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365318,
-                    "current_period_start": 1449686918,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885667,
+                    "current_period_start": 1450207267,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -329,27 +329,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQ5Bu6XkKKf7",
+            "id": "sub_7XTIbgbJaVMUZu",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365323,
-            "current_period_start": 1449686923,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885672,
+            "current_period_start": 1450207272,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQ5Bu6XkKKf7"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIbgbJaVMUZu"
             },
             "metadata": {
                 "id": "0000000000000000000186d9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -357,22 +357,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -380,61 +380,61 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQAGb91sokrC",
+                        "id": "sub_7XTIYZBmGU4c3H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365321,
-                        "current_period_start": 1449686921,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885670,
+                        "current_period_start": 1450207270,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQAGb91sokrC"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIYZBmGU4c3H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -446,14 +446,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
@@ -461,7 +461,7 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1598
+            "quantity": 160
         }
     },
     {
@@ -472,13 +472,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCzZKaReE7xLUdZuvouIlH",
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "id": "in_17IOMIKaReE7xLUd0MVrPWkO",
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQIByGPu92Pi",
-                                "amount": 1598,
+                                "id": "sub_7XTID1qSsh85dM",
+                                "amount": 160,
                                 "metadata": {
                                     "id": "0000000000000000000186da"
                                 },
@@ -487,37 +487,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 1598,
+                                "quantity": 160,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQIByGPu92Pi",
-                    "total": 1598
+                    "subscription": "sub_7XTID1qSsh85dM",
+                    "total": 160
                 },
                 {
-                    "id": "in_17GCzXKaReE7xLUdMlG9IOJd",
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "id": "in_17IOMGKaReE7xLUd3L2l6qdb",
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "subscription": "sub_7VDQ5Bu6XkKKf7"
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "subscription": "sub_7XTIbgbJaVMUZu"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQ5Bu6XkKKf7",
-                                "amount": 999,
+                                "id": "sub_7XTIbgbJaVMUZu",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d9"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -527,30 +527,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQ5Bu6XkKKf7",
+                    "subscription": "sub_7XTIbgbJaVMUZu",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzVKaReE7xLUd743tdEzQ",
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "id": "in_17IOMEKaReE7xLUdnnvFoYPN",
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "subscription": "sub_7VDQAGb91sokrC"
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "subscription": "sub_7XTIYZBmGU4c3H"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQAGb91sokrC",
-                                "amount": 999,
+                                "id": "sub_7XTIYZBmGU4c3H",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186d8"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -560,23 +560,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQAGb91sokrC",
+                    "subscription": "sub_7XTIYZBmGU4c3H",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzSKaReE7xLUdm6NqRmYu",
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "id": "in_17IOMBKaReE7xLUdXQoG8psb",
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQqnNzHi02T7",
-                                "amount": 999,
+                                "id": "sub_7XTIVho90wZ0EA",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186da"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -586,8 +586,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQqnNzHi02T7",
-                    "total": 999
+                    "subscription": "sub_7XTIVho90wZ0EA",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -596,22 +596,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -619,11 +619,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -631,64 +631,64 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQAGb91sokrC",
+                        "id": "sub_7XTIYZBmGU4c3H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365321,
-                        "current_period_start": 1449686921,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885670,
+                        "current_period_start": 1450207270,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQAGb91sokrC"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIYZBmGU4c3H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -697,25 +697,57 @@
             }
         }
     },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/invoices/in_17IOMIKaReE7xLUd0MVrPWkO",
+        "status": 200,
+        "response": {
+            "id": "in_17IOMIKaReE7xLUd0MVrPWkO",
+            "customer": "cus_7XTI7OtNzsUxmY",
+            "lines": {
+                "data": [
+                    {
+                        "id": "sub_7XTID1qSsh85dM",
+                        "amount": 160,
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "proration": false,
+                        "quantity": 160,
+                        "type": "subscription"
+                    }
+                ],
+                "has_more": false
+            },
+            "paid": true,
+            "subscription": "sub_7XTID1qSsh85dM",
+            "total": 160
+        }
+    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -723,11 +755,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -735,64 +767,64 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQAGb91sokrC",
+                        "id": "sub_7XTIYZBmGU4c3H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365321,
-                        "current_period_start": 1449686921,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885670,
+                        "current_period_start": 1450207270,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQAGb91sokrC"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIYZBmGU4c3H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -804,54 +836,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzZKaReE7xLUdZuvouIlH",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "in_17GCzZKaReE7xLUdZuvouIlH",
-            "customer": "cus_7VDQrpzK9GSS5U",
-            "lines": {
-                "data": [
-                    {
-                        "id": "sub_7VDQIByGPu92Pi",
-                        "amount": 1598,
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "proration": false,
-                        "quantity": 1598,
-                        "type": "subscription"
-                    }
-                ],
-                "has_more": false
-            },
-            "paid": true,
-            "subscription": "sub_7VDQIByGPu92Pi",
-            "total": 1598
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -859,11 +859,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -871,64 +871,64 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQAGb91sokrC",
+                        "id": "sub_7XTIYZBmGU4c3H",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365321,
-                        "current_period_start": 1449686921,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885670,
+                        "current_period_start": 1450207270,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQAGb91sokrC"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIYZBmGU4c3H"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -940,29 +940,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzXKaReE7xLUdMlG9IOJd",
+        "path": "/v1/invoices/in_17IOMGKaReE7xLUd3L2l6qdb",
         "status": 200,
         "response": {
-            "id": "in_17GCzXKaReE7xLUdMlG9IOJd",
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "id": "in_17IOMGKaReE7xLUd3L2l6qdb",
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQ5Bu6XkKKf7"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIbgbJaVMUZu"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
-                        "amount": 999,
+                        "id": "sub_7XTIbgbJaVMUZu",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -972,36 +972,36 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQ5Bu6XkKKf7",
+            "subscription": "sub_7XTIbgbJaVMUZu",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzVKaReE7xLUd743tdEzQ",
+        "path": "/v1/invoices/in_17IOMEKaReE7xLUdnnvFoYPN",
         "status": 200,
         "response": {
-            "id": "in_17GCzVKaReE7xLUd743tdEzQ",
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "id": "in_17IOMEKaReE7xLUdnnvFoYPN",
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQAGb91sokrC"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIYZBmGU4c3H"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQAGb91sokrC",
-                        "amount": 999,
+                        "id": "sub_7XTIYZBmGU4c3H",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186d8"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1011,29 +1011,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQAGb91sokrC",
+            "subscription": "sub_7XTIYZBmGU4c3H",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzSKaReE7xLUdm6NqRmYu",
+        "path": "/v1/invoices/in_17IOMBKaReE7xLUdXQoG8psb",
         "status": 200,
         "response": {
-            "id": "in_17GCzSKaReE7xLUdm6NqRmYu",
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "id": "in_17IOMBKaReE7xLUdXQoG8psb",
+            "customer": "cus_7XTI7OtNzsUxmY",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
-                        "amount": 999,
+                        "id": "sub_7XTIVho90wZ0EA",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1043,21 +1043,125 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQqnNzHi02T7",
-            "total": 999
+            "subscription": "sub_7XTIVho90wZ0EA",
+            "total": 100
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTI7OtNzsUxmY",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user56@me.com",
+            "metadata": {
+                "id": "0000000000000000000186da"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTID1qSsh85dM",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 160
+                    },
+                    {
+                        "id": "sub_7XTIbgbJaVMUZu",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186d9"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTIYZBmGU4c3H",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885670,
+                        "current_period_start": 1450207270,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIYZBmGU4c3H"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186d8"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTIVho90wZ0EA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
@@ -1065,137 +1169,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1598
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user156@me.com",
-            "metadata": {
-                "id": "0000000000000000000186da"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQIByGPu92Pi",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 1598
-                    },
-                    {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186d9"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQAGb91sokrC",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365321,
-                        "current_period_start": 1449686921,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQAGb91sokrC"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186d8"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQqnNzHi02T7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
+            "quantity": 160
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQAGb91sokrC",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIYZBmGU4c3H",
         "status": 200,
         "response": {
-            "id": "sub_7VDQAGb91sokrC",
+            "id": "sub_7XTIYZBmGU4c3H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365321,
-            "current_period_start": 1449686921,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885670,
+            "current_period_start": 1450207270,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQAGb91sokrC"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIYZBmGU4c3H"
             },
             "metadata": {
                 "id": "0000000000000000000186d8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1203,14 +1203,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
@@ -1218,33 +1218,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1598
+            "quantity": 160
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQ5Bu6XkKKf7",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIbgbJaVMUZu",
         "status": 200,
         "response": {
-            "id": "sub_7VDQ5Bu6XkKKf7",
+            "id": "sub_7XTIbgbJaVMUZu",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365323,
-            "current_period_start": 1449686923,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885672,
+            "current_period_start": 1450207272,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQ5Bu6XkKKf7"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIbgbJaVMUZu"
             },
             "metadata": {
                 "id": "0000000000000000000186d9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1252,27 +1252,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQAGb91sokrC",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIYZBmGU4c3H",
         "status": 200,
         "response": {
-            "id": "sub_7VDQAGb91sokrC",
+            "id": "sub_7XTIYZBmGU4c3H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365321,
-            "current_period_start": 1449686921,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885670,
+            "current_period_start": 1450207270,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQAGb91sokrC"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIYZBmGU4c3H"
             },
             "metadata": {
                 "id": "0000000000000000000186d8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1280,27 +1280,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQAGb91sokrC",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIYZBmGU4c3H",
         "status": 200,
         "response": {
-            "id": "sub_7VDQAGb91sokrC",
+            "id": "sub_7XTIYZBmGU4c3H",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365321,
-            "current_period_start": 1449686921,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885670,
+            "current_period_start": 1450207270,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQAGb91sokrC"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIYZBmGU4c3H"
             },
             "metadata": {
                 "id": "0000000000000000000186d8"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1308,22 +1308,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -1331,11 +1331,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -1343,42 +1343,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1390,14 +1390,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
@@ -1405,22 +1405,22 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQIByGPu92Pi",
+                    "id": "sub_7XTID1qSsh85dM",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365325,
-                    "current_period_start": 1449686925,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885674,
+                    "current_period_start": 1450207274,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
@@ -1428,42 +1428,42 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 799
+                    "quantity": 80
                 },
                 {
-                    "id": "sub_7VDQ5Bu6XkKKf7",
+                    "id": "sub_7XTIbgbJaVMUZu",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365323,
-                    "current_period_start": 1449686923,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885672,
+                    "current_period_start": 1450207272,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "subscription": "sub_7VDQ5Bu6XkKKf7"
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "subscription": "sub_7XTIbgbJaVMUZu"
                     },
                     "metadata": {
                         "id": "0000000000000000000186d9"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQqnNzHi02T7",
+                    "id": "sub_7XTIVho90wZ0EA",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365318,
-                    "current_period_start": 1449686918,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885667,
+                    "current_period_start": 1450207267,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -1473,23 +1473,44 @@
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "sub_7XTID1qSsh85dM",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
+            "metadata": {
+                "id": "0000000000000000000186da"
+            },
+            "plan": {
+                "id": "incremental",
+                "amount": 1
+            },
+            "quantity": 80
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -1497,11 +1518,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -1509,42 +1530,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDQ5Bu6XkKKf7",
+                        "id": "sub_7XTIbgbJaVMUZu",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365323,
-                        "current_period_start": 1449686923,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885672,
+                        "current_period_start": 1450207272,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQrpzK9GSS5U",
-                            "subscription": "sub_7VDQ5Bu6XkKKf7"
+                            "customer": "cus_7XTI7OtNzsUxmY",
+                            "subscription": "sub_7XTIbgbJaVMUZu"
                         },
                         "metadata": {
                             "id": "0000000000000000000186d9"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1556,48 +1577,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIbgbJaVMUZu",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTIbgbJaVMUZu",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
-            "metadata": {
-                "id": "0000000000000000000186da"
-            },
-            "plan": {
-                "id": "incremental",
-                "amount": 1
-            },
-            "quantity": 799
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQ5Bu6XkKKf7",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQ5Bu6XkKKf7",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365323,
-            "current_period_start": 1449686923,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885672,
+            "current_period_start": 1450207272,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQ5Bu6XkKKf7"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIbgbJaVMUZu"
             },
             "metadata": {
                 "id": "0000000000000000000186d9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1605,27 +1605,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQ5Bu6XkKKf7",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTIbgbJaVMUZu",
         "status": 200,
         "response": {
-            "id": "sub_7VDQ5Bu6XkKKf7",
+            "id": "sub_7XTIbgbJaVMUZu",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365323,
-            "current_period_start": 1449686923,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885672,
+            "current_period_start": 1450207272,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQrpzK9GSS5U",
-                "subscription": "sub_7VDQ5Bu6XkKKf7"
+                "customer": "cus_7XTI7OtNzsUxmY",
+                "subscription": "sub_7XTIbgbJaVMUZu"
             },
             "metadata": {
                 "id": "0000000000000000000186d9"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1633,14 +1633,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
@@ -1654,22 +1654,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
+            "id": "cus_7XTI7OtNzsUxmY",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user156@me.com",
+            "email": "user56@me.com",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
                     }
                 ],
                 "has_more": false
@@ -1677,11 +1677,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQIByGPu92Pi",
+                        "id": "sub_7XTID1qSsh85dM",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
@@ -1692,77 +1692,17 @@
                         "quantity": 0
                     },
                     {
-                        "id": "sub_7VDQqnNzHi02T7",
+                        "id": "sub_7XTIVho90wZ0EA",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
                         "metadata": {
                             "id": "0000000000000000000186da"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQrpzK9GSS5U",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user156@me.com",
-            "metadata": {
-                "id": "0000000000000000000186da"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCzQKaReE7xLUd4kDDn4Fh",
-                        "customer": "cus_7VDQrpzK9GSS5U"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQIByGPu92Pi",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365325,
-                        "current_period_start": 1449686925,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 0
-                    },
-                    {
-                        "id": "sub_7VDQqnNzHi02T7",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365318,
-                        "current_period_start": 1449686918,
-                        "customer": "cus_7VDQrpzK9GSS5U",
-                        "metadata": {
-                            "id": "0000000000000000000186da"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1774,16 +1714,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQIByGPu92Pi",
+                    "id": "sub_7XTID1qSsh85dM",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365325,
-                    "current_period_start": 1449686925,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885674,
+                    "current_period_start": 1450207274,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
@@ -1794,17 +1734,17 @@
                     "quantity": 0
                 },
                 {
-                    "id": "sub_7VDQqnNzHi02T7",
+                    "id": "sub_7XTIVho90wZ0EA",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365318,
-                    "current_period_start": 1449686918,
-                    "customer": "cus_7VDQrpzK9GSS5U",
+                    "current_period_end": 1452885667,
+                    "current_period_start": 1450207267,
+                    "customer": "cus_7XTI7OtNzsUxmY",
                     "metadata": {
                         "id": "0000000000000000000186da"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -1814,15 +1754,75 @@
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQrpzK9GSS5U/subscriptions/sub_7VDQIByGPu92Pi",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY",
         "status": 200,
         "response": {
-            "id": "sub_7VDQIByGPu92Pi",
+            "id": "cus_7XTI7OtNzsUxmY",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user56@me.com",
+            "metadata": {
+                "id": "0000000000000000000186da"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMAKaReE7xLUdq71byow9",
+                        "customer": "cus_7XTI7OtNzsUxmY"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTID1qSsh85dM",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885674,
+                        "current_period_start": 1450207274,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 0
+                    },
+                    {
+                        "id": "sub_7XTIVho90wZ0EA",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885667,
+                        "current_period_start": 1450207267,
+                        "customer": "cus_7XTI7OtNzsUxmY",
+                        "metadata": {
+                            "id": "0000000000000000000186da"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTI7OtNzsUxmY/subscriptions/sub_7XTID1qSsh85dM",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTID1qSsh85dM",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365325,
-            "current_period_start": 1449686925,
-            "customer": "cus_7VDQrpzK9GSS5U",
+            "current_period_end": 1452885674,
+            "current_period_start": 1450207274,
+            "customer": "cus_7XTI7OtNzsUxmY",
             "metadata": {
                 "id": "0000000000000000000186da"
             },
diff --git a/spec/fixtures/sub-test-33.json b/spec/fixtures/sub-test-33.json
index e31c362fe..760f72f5b 100644
--- a/spec/fixtures/sub-test-33.json
+++ b/spec/fixtures/sub-test-33.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GCznKaReE7xLUdqZxzUdKq",
+            "id": "tok_17IOMYKaReE7xLUd0aawyZQa",
             "card": {
-                "id": "card_17GCznKaReE7xLUdmclsW7nv"
+                "id": "card_17IOMYKaReE7xLUdmRtYqdc9"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -43,71 +43,43 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQYgFOUGI8r9",
+            "id": "sub_7XTJT489x5FhY4",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365340,
-            "current_period_start": 1449686940,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885692,
+            "current_period_start": 1450207292,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
     {
         "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -115,17 +87,62 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -137,22 +154,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -160,17 +177,62 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -182,22 +244,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -208,72 +270,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQYgFOUGI8r9",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQZ91PX2G0Tj",
+            "id": "sub_7XTJ7hbT8nllsG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365343,
-            "current_period_start": 1449686943,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885699,
+            "current_period_start": 1450207299,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQZ91PX2G0Tj"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ7hbT8nllsG"
             },
             "metadata": {
                 "id": "0000000000000000000186db"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -281,44 +298,44 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQZ91PX2G0Tj",
+                    "id": "sub_7XTJ7hbT8nllsG",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365343,
-                    "current_period_start": 1449686943,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885699,
+                    "current_period_start": 1450207299,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQZ91PX2G0Tj"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ7hbT8nllsG"
                     },
                     "metadata": {
                         "id": "0000000000000000000186db"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -329,27 +346,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQj6CEnlk5u8",
+            "id": "sub_7XTJ6PSWub2w2a",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365344,
-            "current_period_start": 1449686944,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885701,
+            "current_period_start": 1450207301,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQj6CEnlk5u8"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ6PSWub2w2a"
             },
             "metadata": {
                 "id": "0000000000000000000186dc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -357,66 +374,66 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQj6CEnlk5u8",
+                    "id": "sub_7XTJ6PSWub2w2a",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365344,
-                    "current_period_start": 1449686944,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885701,
+                    "current_period_start": 1450207301,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQj6CEnlk5u8"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ6PSWub2w2a"
                     },
                     "metadata": {
                         "id": "0000000000000000000186dc"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQZ91PX2G0Tj",
+                    "id": "sub_7XTJ7hbT8nllsG",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365343,
-                    "current_period_start": 1449686943,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885699,
+                    "current_period_start": 1450207299,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQZ91PX2G0Tj"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ7hbT8nllsG"
                     },
                     "metadata": {
                         "id": "0000000000000000000186db"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -427,27 +444,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDQOGP4cNiGgs",
+            "id": "sub_7XTJpQ8kmwXUbw",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365346,
-            "current_period_start": 1449686946,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885709,
+            "current_period_start": 1450207309,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
             },
             "metadata": {
                 "id": "0000000000000000000186dd"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -455,125 +472,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQOGP4cNiGgs",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186dd"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQj6CEnlk5u8",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186dc"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQZ91PX2G0Tj",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365343,
-                        "current_period_start": 1449686943,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQZ91PX2G0Tj"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186db"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQYgFOUGI8r9",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -581,7 +487,133 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 2398
+            "quantity": 240
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJzuKniQdCRO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 240
+                    },
+                    {
+                        "id": "sub_7XTJpQ8kmwXUbw",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186dd"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTJ6PSWub2w2a",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186dc"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTJ7hbT8nllsG",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885699,
+                        "current_period_start": 1450207299,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ7hbT8nllsG"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186db"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
@@ -592,13 +624,13 @@
         "response": {
             "data": [
                 {
-                    "id": "in_17GCzwKaReE7xLUdBi1VCrbQ",
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "id": "in_17IOMtKaReE7xLUdkPQSHSOR",
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQl97MLLoXEp",
-                                "amount": 2398,
+                                "id": "sub_7XTJzuKniQdCRO",
+                                "amount": 240,
                                 "metadata": {
                                     "id": "0000000000000000000186de"
                                 },
@@ -607,37 +639,37 @@
                                     "amount": 1
                                 },
                                 "proration": false,
-                                "quantity": 2398,
+                                "quantity": 240,
                                 "type": "subscription"
                             }
                         ],
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQl97MLLoXEp",
-                    "total": 2398
+                    "subscription": "sub_7XTJzuKniQdCRO",
+                    "total": 240
                 },
                 {
-                    "id": "in_17GCzuKaReE7xLUdlt1WrP6F",
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "id": "in_17IOMrKaReE7xLUdzQ4ZRkFa",
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQOGP4cNiGgs"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJpQ8kmwXUbw"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQOGP4cNiGgs",
-                                "amount": 999,
+                                "id": "sub_7XTJpQ8kmwXUbw",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186dd"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -647,30 +679,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQOGP4cNiGgs",
+                    "subscription": "sub_7XTJpQ8kmwXUbw",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzsKaReE7xLUd0r2dKONY",
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "id": "in_17IOMjKaReE7xLUdaUMLQu4K",
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQj6CEnlk5u8"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ6PSWub2w2a"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQj6CEnlk5u8",
-                                "amount": 999,
+                                "id": "sub_7XTJ6PSWub2w2a",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186dc"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -680,30 +712,30 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQj6CEnlk5u8",
+                    "subscription": "sub_7XTJ6PSWub2w2a",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzrKaReE7xLUdDFBkmIM1",
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "id": "in_17IOMhKaReE7xLUd7fYUh8gP",
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQZ91PX2G0Tj"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ7hbT8nllsG"
                     },
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQZ91PX2G0Tj",
-                                "amount": 999,
+                                "id": "sub_7XTJ7hbT8nllsG",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186db"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -713,23 +745,23 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQZ91PX2G0Tj",
+                    "subscription": "sub_7XTJ7hbT8nllsG",
                     "total": 0
                 },
                 {
-                    "id": "in_17GCzoKaReE7xLUdILkFu9Lf",
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "id": "in_17IOMaKaReE7xLUdtf92UBZV",
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "lines": {
                         "data": [
                             {
-                                "id": "sub_7VDQYgFOUGI8r9",
-                                "amount": 999,
+                                "id": "sub_7XTJT489x5FhY4",
+                                "amount": 100,
                                 "metadata": {
                                     "id": "0000000000000000000186de"
                                 },
                                 "plan": {
                                     "id": "basic",
-                                    "amount": 999
+                                    "amount": 100
                                 },
                                 "proration": false,
                                 "quantity": 1,
@@ -739,8 +771,8 @@
                         "has_more": false
                     },
                     "paid": true,
-                    "subscription": "sub_7VDQYgFOUGI8r9",
-                    "total": 999
+                    "subscription": "sub_7XTJT489x5FhY4",
+                    "total": 100
                 }
             ],
             "has_more": false
@@ -749,22 +781,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -772,11 +804,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -784,86 +816,86 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 2398
+                        "quantity": 240
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQZ91PX2G0Tj",
+                        "id": "sub_7XTJ7hbT8nllsG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365343,
-                        "current_period_start": 1449686943,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885699,
+                        "current_period_start": 1450207299,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQZ91PX2G0Tj"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ7hbT8nllsG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186db"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -872,57 +904,25 @@
             }
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/invoices/in_17GCzwKaReE7xLUdBi1VCrbQ",
-        "status": 200,
-        "response": {
-            "id": "in_17GCzwKaReE7xLUdBi1VCrbQ",
-            "customer": "cus_7VDQzWMIpIdaTg",
-            "lines": {
-                "data": [
-                    {
-                        "id": "sub_7VDQl97MLLoXEp",
-                        "amount": 2398,
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "proration": false,
-                        "quantity": 2398,
-                        "type": "subscription"
-                    }
-                ],
-                "has_more": false
-            },
-            "paid": true,
-            "subscription": "sub_7VDQl97MLLoXEp",
-            "total": 2398
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -930,11 +930,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -942,86 +942,86 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 2398
+                        "quantity": 240
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQZ91PX2G0Tj",
+                        "id": "sub_7XTJ7hbT8nllsG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365343,
-                        "current_period_start": 1449686943,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885699,
+                        "current_period_start": 1450207299,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQZ91PX2G0Tj"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ7hbT8nllsG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186db"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1033,34 +1033,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/invoices/in_17IOMtKaReE7xLUdkPQSHSOR",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
+            "id": "in_17IOMtKaReE7xLUdkPQSHSOR",
+            "customer": "cus_7XTJk0ZqLpYncz",
+            "lines": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQl97MLLoXEp",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "id": "sub_7XTJzuKniQdCRO",
+                        "amount": 240,
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -1068,86 +1050,136 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 2398
+                        "proration": false,
+                        "quantity": 240,
+                        "type": "subscription"
+                    }
+                ],
+                "has_more": false
+            },
+            "paid": true,
+            "subscription": "sub_7XTJzuKniQdCRO",
+            "total": 240
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJzuKniQdCRO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 240
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQZ91PX2G0Tj",
+                        "id": "sub_7XTJ7hbT8nllsG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365343,
-                        "current_period_start": 1449686943,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885699,
+                        "current_period_start": 1450207299,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQZ91PX2G0Tj"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ7hbT8nllsG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186db"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1159,29 +1191,29 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzuKaReE7xLUdlt1WrP6F",
+        "path": "/v1/invoices/in_17IOMrKaReE7xLUdzQ4ZRkFa",
         "status": 200,
         "response": {
-            "id": "in_17GCzuKaReE7xLUdlt1WrP6F",
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "id": "in_17IOMrKaReE7xLUdzQ4ZRkFa",
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
-                        "amount": 999,
+                        "id": "sub_7XTJpQ8kmwXUbw",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1191,36 +1223,36 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQOGP4cNiGgs",
+            "subscription": "sub_7XTJpQ8kmwXUbw",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzsKaReE7xLUd0r2dKONY",
+        "path": "/v1/invoices/in_17IOMjKaReE7xLUdaUMLQu4K",
         "status": 200,
         "response": {
-            "id": "in_17GCzsKaReE7xLUd0r2dKONY",
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "id": "in_17IOMjKaReE7xLUdaUMLQu4K",
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQj6CEnlk5u8"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ6PSWub2w2a"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
-                        "amount": 999,
+                        "id": "sub_7XTJ6PSWub2w2a",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1230,36 +1262,36 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQj6CEnlk5u8",
+            "subscription": "sub_7XTJ6PSWub2w2a",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzrKaReE7xLUdDFBkmIM1",
+        "path": "/v1/invoices/in_17IOMhKaReE7xLUd7fYUh8gP",
         "status": 200,
         "response": {
-            "id": "in_17GCzrKaReE7xLUdDFBkmIM1",
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "id": "in_17IOMhKaReE7xLUd7fYUh8gP",
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQZ91PX2G0Tj"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ7hbT8nllsG"
             },
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQZ91PX2G0Tj",
-                        "amount": 999,
+                        "id": "sub_7XTJ7hbT8nllsG",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186db"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1269,29 +1301,29 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQZ91PX2G0Tj",
+            "subscription": "sub_7XTJ7hbT8nllsG",
             "total": 0
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/invoices/in_17GCzoKaReE7xLUdILkFu9Lf",
+        "path": "/v1/invoices/in_17IOMaKaReE7xLUdtf92UBZV",
         "status": 200,
         "response": {
-            "id": "in_17GCzoKaReE7xLUdILkFu9Lf",
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "id": "in_17IOMaKaReE7xLUdtf92UBZV",
+            "customer": "cus_7XTJk0ZqLpYncz",
             "lines": {
                 "data": [
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
-                        "amount": 999,
+                        "id": "sub_7XTJT489x5FhY4",
+                        "amount": 100,
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "proration": false,
                         "quantity": 1,
@@ -1301,21 +1333,21 @@
                 "has_more": false
             },
             "paid": true,
-            "subscription": "sub_7VDQYgFOUGI8r9",
-            "total": 999
+            "subscription": "sub_7XTJT489x5FhY4",
+            "total": 100
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -1323,28 +1355,28 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 2398
+            "quantity": 240
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -1352,11 +1384,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -1364,86 +1396,86 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 2398
+                        "quantity": 240
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQZ91PX2G0Tj",
+                        "id": "sub_7XTJ7hbT8nllsG",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365343,
-                        "current_period_start": 1449686943,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885699,
+                        "current_period_start": 1450207299,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQZ91PX2G0Tj"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ7hbT8nllsG"
                         },
                         "metadata": {
                             "id": "0000000000000000000186db"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1455,27 +1487,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQZ91PX2G0Tj",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ7hbT8nllsG",
         "status": 200,
         "response": {
-            "id": "sub_7VDQZ91PX2G0Tj",
+            "id": "sub_7XTJ7hbT8nllsG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365343,
-            "current_period_start": 1449686943,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885699,
+            "current_period_start": 1450207299,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQZ91PX2G0Tj"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ7hbT8nllsG"
             },
             "metadata": {
                 "id": "0000000000000000000186db"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1483,14 +1515,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -1498,33 +1530,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 2398
+            "quantity": 240
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQj6CEnlk5u8",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ6PSWub2w2a",
         "status": 200,
         "response": {
-            "id": "sub_7VDQj6CEnlk5u8",
+            "id": "sub_7XTJ6PSWub2w2a",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365344,
-            "current_period_start": 1449686944,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885701,
+            "current_period_start": 1450207301,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQj6CEnlk5u8"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ6PSWub2w2a"
             },
             "metadata": {
                 "id": "0000000000000000000186dc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1532,14 +1564,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -1547,33 +1579,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 2398
+            "quantity": 240
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQOGP4cNiGgs",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJpQ8kmwXUbw",
         "status": 200,
         "response": {
-            "id": "sub_7VDQOGP4cNiGgs",
+            "id": "sub_7XTJpQ8kmwXUbw",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365346,
-            "current_period_start": 1449686946,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885709,
+            "current_period_start": 1450207309,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
             },
             "metadata": {
                 "id": "0000000000000000000186dd"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1581,27 +1613,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQZ91PX2G0Tj",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ7hbT8nllsG",
         "status": 200,
         "response": {
-            "id": "sub_7VDQZ91PX2G0Tj",
+            "id": "sub_7XTJ7hbT8nllsG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365343,
-            "current_period_start": 1449686943,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885699,
+            "current_period_start": 1450207299,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQZ91PX2G0Tj"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ7hbT8nllsG"
             },
             "metadata": {
                 "id": "0000000000000000000186db"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1609,27 +1641,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQZ91PX2G0Tj",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ7hbT8nllsG",
         "status": 200,
         "response": {
-            "id": "sub_7VDQZ91PX2G0Tj",
+            "id": "sub_7XTJ7hbT8nllsG",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365343,
-            "current_period_start": 1449686943,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885699,
+            "current_period_start": 1450207299,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQZ91PX2G0Tj"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ7hbT8nllsG"
             },
             "metadata": {
                 "id": "0000000000000000000186db"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -1637,22 +1669,43 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "sub_7XTJzuKniQdCRO",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "plan": {
+                "id": "incremental",
+                "amount": 1
+            },
+            "quantity": 160
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -1660,11 +1713,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -1672,64 +1725,64 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 2398
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1738,40 +1791,19 @@
             }
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQl97MLLoXEp",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "plan": {
-                "id": "incremental",
-                "amount": 1
-            },
-            "quantity": 1598
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQl97MLLoXEp",
+                    "id": "sub_7XTJzuKniQdCRO",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365348,
-                    "current_period_start": 1449686948,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885711,
+                    "current_period_start": 1450207311,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
@@ -1779,64 +1811,64 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 1598
+                    "quantity": 160
                 },
                 {
-                    "id": "sub_7VDQOGP4cNiGgs",
+                    "id": "sub_7XTJpQ8kmwXUbw",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365346,
-                    "current_period_start": 1449686946,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885709,
+                    "current_period_start": 1450207309,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQOGP4cNiGgs"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJpQ8kmwXUbw"
                     },
                     "metadata": {
                         "id": "0000000000000000000186dd"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQj6CEnlk5u8",
+                    "id": "sub_7XTJ6PSWub2w2a",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365344,
-                    "current_period_start": 1449686944,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885701,
+                    "current_period_start": 1450207301,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQj6CEnlk5u8"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJ6PSWub2w2a"
                     },
                     "metadata": {
                         "id": "0000000000000000000186dc"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -1847,22 +1879,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -1870,11 +1902,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -1882,64 +1914,64 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQj6CEnlk5u8",
+                        "id": "sub_7XTJ6PSWub2w2a",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365344,
-                        "current_period_start": 1449686944,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885701,
+                        "current_period_start": 1450207301,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQj6CEnlk5u8"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJ6PSWub2w2a"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dc"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -1951,14 +1983,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -1966,33 +1998,33 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 1598
+            "quantity": 160
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQj6CEnlk5u8",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ6PSWub2w2a",
         "status": 200,
         "response": {
-            "id": "sub_7VDQj6CEnlk5u8",
+            "id": "sub_7XTJ6PSWub2w2a",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365344,
-            "current_period_start": 1449686944,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885701,
+            "current_period_start": 1450207301,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQj6CEnlk5u8"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ6PSWub2w2a"
             },
             "metadata": {
                 "id": "0000000000000000000186dc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -2000,27 +2032,27 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQj6CEnlk5u8",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJ6PSWub2w2a",
         "status": 200,
         "response": {
-            "id": "sub_7VDQj6CEnlk5u8",
+            "id": "sub_7XTJ6PSWub2w2a",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365344,
-            "current_period_start": 1449686944,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885701,
+            "current_period_start": 1450207301,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "discount": {
                 "coupon": {
                     "id": "free"
                 },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQj6CEnlk5u8"
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJ6PSWub2w2a"
             },
             "metadata": {
                 "id": "0000000000000000000186dc"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -2028,22 +2060,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -2051,11 +2083,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -2063,42 +2095,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 1598
+                        "quantity": 160
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2110,14 +2142,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -2125,22 +2157,22 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQl97MLLoXEp",
+                    "id": "sub_7XTJzuKniQdCRO",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365348,
-                    "current_period_start": 1449686948,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885711,
+                    "current_period_start": 1450207311,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
@@ -2148,42 +2180,42 @@
                         "id": "incremental",
                         "amount": 1
                     },
-                    "quantity": 799
+                    "quantity": 80
                 },
                 {
-                    "id": "sub_7VDQOGP4cNiGgs",
+                    "id": "sub_7XTJpQ8kmwXUbw",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365346,
-                    "current_period_start": 1449686946,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885709,
+                    "current_period_start": 1450207309,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "discount": {
                         "coupon": {
                             "id": "free"
                         },
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "subscription": "sub_7VDQOGP4cNiGgs"
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "subscription": "sub_7XTJpQ8kmwXUbw"
                     },
                     "metadata": {
                         "id": "0000000000000000000186dd"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 },
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -2191,99 +2223,17 @@
             "has_more": false
         }
     },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQl97MLLoXEp",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 799
-                    },
-                    {
-                        "id": "sub_7VDQOGP4cNiGgs",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186dd"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQYgFOUGI8r9",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -2291,26 +2241,108 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
+            "quantity": 80
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJzuKniQdCRO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTJpQ8kmwXUbw",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186dd"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQYgFOUGI8r9",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJT489x5FhY4",
         "status": 200,
         "response": {
-            "id": "sub_7VDQYgFOUGI8r9",
+            "id": "sub_7XTJT489x5FhY4",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365340,
-            "current_period_start": 1449686940,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885692,
+            "current_period_start": 1450207292,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -2318,20 +2350,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQYgFOUGI8r9",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJT489x5FhY4",
         "status": 200,
         "response": {
-            "id": "sub_7VDQYgFOUGI8r9",
+            "id": "sub_7XTJT489x5FhY4",
             "cancel_at_period_end": true,
-            "current_period_end": 1452365340,
-            "current_period_start": 1449686940,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885692,
+            "current_period_start": 1450207292,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -2339,22 +2371,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -2362,11 +2394,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -2374,124 +2406,42 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDQOGP4cNiGgs",
+                        "id": "sub_7XTJpQ8kmwXUbw",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "discount": {
                             "coupon": {
                                 "id": "free"
                             },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
                         },
                         "metadata": {
                             "id": "0000000000000000000186dd"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user160@me.com",
-            "metadata": {
-                "id": "0000000000000000000186de"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDQl97MLLoXEp",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "incremental",
-                            "amount": 1
-                        },
-                        "quantity": 799
-                    },
-                    {
-                        "id": "sub_7VDQOGP4cNiGgs",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365346,
-                        "current_period_start": 1449686946,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "discount": {
-                            "coupon": {
-                                "id": "free"
-                            },
-                            "customer": "cus_7VDQzWMIpIdaTg",
-                            "subscription": "sub_7VDQOGP4cNiGgs"
-                        },
-                        "metadata": {
-                            "id": "0000000000000000000186dd"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    },
-                    {
-                        "id": "sub_7VDQYgFOUGI8r9",
-                        "cancel_at_period_end": true,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
-                        "metadata": {
-                            "id": "0000000000000000000186de"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2503,14 +2453,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -2518,112 +2468,28 @@
                 "id": "incremental",
                 "amount": 1
             },
-            "quantity": 799
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQOGP4cNiGgs",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQOGP4cNiGgs",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365346,
-            "current_period_start": 1449686946,
-            "customer": "cus_7VDQzWMIpIdaTg",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
-            },
-            "metadata": {
-                "id": "0000000000000000000186dd"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQOGP4cNiGgs",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQOGP4cNiGgs",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365346,
-            "current_period_start": 1449686946,
-            "customer": "cus_7VDQzWMIpIdaTg",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
-            },
-            "metadata": {
-                "id": "0000000000000000000186dd"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "DELETE",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQOGP4cNiGgs",
-        "status": 200,
-        "response": {
-            "id": "sub_7VDQOGP4cNiGgs",
-            "cancel_at_period_end": false,
-            "current_period_end": 1452365346,
-            "current_period_start": 1449686946,
-            "customer": "cus_7VDQzWMIpIdaTg",
-            "discount": {
-                "coupon": {
-                    "id": "free"
-                },
-                "customer": "cus_7VDQzWMIpIdaTg",
-                "subscription": "sub_7VDQOGP4cNiGgs"
-            },
-            "metadata": {
-                "id": "0000000000000000000186dd"
-            },
-            "plan": {
-                "id": "basic",
-                "amount": 999
-            },
-            "quantity": 1
+            "quantity": 80
         }
     },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -2631,11 +2497,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -2643,20 +2509,186 @@
                             "id": "incremental",
                             "amount": 1
                         },
-                        "quantity": 799
+                        "quantity": 80
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJpQ8kmwXUbw",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885709,
+                        "current_period_start": 1450207309,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "discount": {
+                            "coupon": {
+                                "id": "free"
+                            },
+                            "customer": "cus_7XTJk0ZqLpYncz",
+                            "subscription": "sub_7XTJpQ8kmwXUbw"
+                        },
+                        "metadata": {
+                            "id": "0000000000000000000186dd"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    },
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJpQ8kmwXUbw",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTJpQ8kmwXUbw",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885709,
+            "current_period_start": 1450207309,
+            "customer": "cus_7XTJk0ZqLpYncz",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
+            },
+            "metadata": {
+                "id": "0000000000000000000186dd"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "GET",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJpQ8kmwXUbw",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTJpQ8kmwXUbw",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885709,
+            "current_period_start": 1450207309,
+            "customer": "cus_7XTJk0ZqLpYncz",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
+            },
+            "metadata": {
+                "id": "0000000000000000000186dd"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "DELETE",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJpQ8kmwXUbw",
+        "status": 200,
+        "response": {
+            "id": "sub_7XTJpQ8kmwXUbw",
+            "cancel_at_period_end": false,
+            "current_period_end": 1452885709,
+            "current_period_start": 1450207309,
+            "customer": "cus_7XTJk0ZqLpYncz",
+            "discount": {
+                "coupon": {
+                    "id": "free"
+                },
+                "customer": "cus_7XTJk0ZqLpYncz",
+                "subscription": "sub_7XTJpQ8kmwXUbw"
+            },
+            "metadata": {
+                "id": "0000000000000000000186dd"
+            },
+            "plan": {
+                "id": "basic",
+                "amount": 100
+            },
+            "quantity": 1
+        }
+    },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTJk0ZqLpYncz",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user60@me.com",
+            "metadata": {
+                "id": "0000000000000000000186de"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTJzuKniQdCRO",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "incremental",
+                            "amount": 1
+                        },
+                        "quantity": 80
+                    },
+                    {
+                        "id": "sub_7XTJT489x5FhY4",
+                        "cancel_at_period_end": true,
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
+                        "metadata": {
+                            "id": "0000000000000000000186de"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2668,14 +2700,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
@@ -2689,16 +2721,16 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDQl97MLLoXEp",
+                    "id": "sub_7XTJzuKniQdCRO",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365348,
-                    "current_period_start": 1449686948,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885711,
+                    "current_period_start": 1450207311,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
@@ -2709,17 +2741,17 @@
                     "quantity": 0
                 },
                 {
-                    "id": "sub_7VDQYgFOUGI8r9",
+                    "id": "sub_7XTJT489x5FhY4",
                     "cancel_at_period_end": true,
-                    "current_period_end": 1452365340,
-                    "current_period_start": 1449686940,
-                    "customer": "cus_7VDQzWMIpIdaTg",
+                    "current_period_end": 1452885692,
+                    "current_period_start": 1450207292,
+                    "customer": "cus_7XTJk0ZqLpYncz",
                     "metadata": {
                         "id": "0000000000000000000186de"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -2730,22 +2762,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz",
         "status": 200,
         "response": {
-            "id": "cus_7VDQzWMIpIdaTg",
+            "id": "cus_7XTJk0ZqLpYncz",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user160@me.com",
+            "email": "user60@me.com",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GCznKaReE7xLUdmclsW7nv",
-                        "customer": "cus_7VDQzWMIpIdaTg"
+                        "id": "card_17IOMYKaReE7xLUdmRtYqdc9",
+                        "customer": "cus_7XTJk0ZqLpYncz"
                     }
                 ],
                 "has_more": false
@@ -2753,11 +2785,11 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDQl97MLLoXEp",
+                        "id": "sub_7XTJzuKniQdCRO",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365348,
-                        "current_period_start": 1449686948,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885711,
+                        "current_period_start": 1450207311,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
@@ -2768,17 +2800,17 @@
                         "quantity": 0
                     },
                     {
-                        "id": "sub_7VDQYgFOUGI8r9",
+                        "id": "sub_7XTJT489x5FhY4",
                         "cancel_at_period_end": true,
-                        "current_period_end": 1452365340,
-                        "current_period_start": 1449686940,
-                        "customer": "cus_7VDQzWMIpIdaTg",
+                        "current_period_end": 1452885692,
+                        "current_period_start": 1450207292,
+                        "customer": "cus_7XTJk0ZqLpYncz",
                         "metadata": {
                             "id": "0000000000000000000186de"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -2790,14 +2822,14 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDQzWMIpIdaTg/subscriptions/sub_7VDQl97MLLoXEp",
+        "path": "/v1/customers/cus_7XTJk0ZqLpYncz/subscriptions/sub_7XTJzuKniQdCRO",
         "status": 200,
         "response": {
-            "id": "sub_7VDQl97MLLoXEp",
+            "id": "sub_7XTJzuKniQdCRO",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365348,
-            "current_period_start": 1449686948,
-            "customer": "cus_7VDQzWMIpIdaTg",
+            "current_period_end": 1452885711,
+            "current_period_start": 1450207311,
+            "customer": "cus_7XTJk0ZqLpYncz",
             "metadata": {
                 "id": "0000000000000000000186de"
             },
diff --git a/spec/fixtures/sub-test-35.json b/spec/fixtures/sub-test-35.json
index 486ab4ef5..efd5e197c 100644
--- a/spec/fixtures/sub-test-35.json
+++ b/spec/fixtures/sub-test-35.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0HKaReE7xLUd0rxsuvV4",
+            "id": "tok_17IONKKaReE7xLUdSNAEOE56",
             "card": {
-                "id": "card_17GD0HKaReE7xLUd8s6L2LQd"
+                "id": "card_17IONKKaReE7xLUdzpopEZsK"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDR3TICfZ2dOG",
+            "id": "cus_7XTJyDBIHBugfk",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user161@me.com",
+            "email": "user61@me.com",
             "metadata": {
                 "id": "0000000000000000000186df"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0HKaReE7xLUd8s6L2LQd",
-                        "customer": "cus_7VDR3TICfZ2dOG"
+                        "id": "card_17IONKKaReE7xLUdzpopEZsK",
+                        "customer": "cus_7XTJyDBIHBugfk"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDR3TICfZ2dOG",
+        "path": "/v1/customers/cus_7XTJyDBIHBugfk",
         "status": 200,
         "response": {
-            "id": "cus_7VDR3TICfZ2dOG",
+            "id": "cus_7XTJyDBIHBugfk",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user161@me.com",
+            "email": "user61@me.com",
             "metadata": {
                 "id": "0000000000000000000186df"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0HKaReE7xLUd8s6L2LQd",
-                        "customer": "cus_7VDR3TICfZ2dOG"
+                        "id": "card_17IONKKaReE7xLUdzpopEZsK",
+                        "customer": "cus_7XTJyDBIHBugfk"
                     }
                 ],
                 "has_more": false
@@ -74,9 +74,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GD0IKaReE7xLUd0tKU82hA",
-            "amount": 9900,
-            "customer": "cus_7VDR3TICfZ2dOG",
+            "id": "ch_17IONMKaReE7xLUdWXD5omBn",
+            "amount": 1000,
+            "customer": "cus_7XTJyDBIHBugfk",
             "metadata": {
                 "gems": "42000",
                 "timestamp": "2015"
@@ -86,8 +86,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GD0HKaReE7xLUd8s6L2LQd",
-                "customer": "cus_7VDR3TICfZ2dOG"
+                "id": "card_17IONKKaReE7xLUdzpopEZsK",
+                "customer": "cus_7XTJyDBIHBugfk"
             }
         }
     }
diff --git a/spec/fixtures/sub-test-36.json b/spec/fixtures/sub-test-36.json
index a7a278d43..1423754e8 100644
--- a/spec/fixtures/sub-test-36.json
+++ b/spec/fixtures/sub-test-36.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0JKaReE7xLUdWVmsHjiV",
+            "id": "tok_17IONMKaReE7xLUddwoh0mUv",
             "card": {
-                "id": "card_17GD0JKaReE7xLUdtK4zhxIR"
+                "id": "card_17IONMKaReE7xLUdAWwyCgK1"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDRHzOeafhAar",
+            "id": "cus_7XTKOfHzCqe1DF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user162@me.com",
+            "email": "user62@me.com",
             "metadata": {
                 "id": "0000000000000000000186e0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0JKaReE7xLUdtK4zhxIR",
-                        "customer": "cus_7VDRHzOeafhAar"
+                        "id": "card_17IONMKaReE7xLUdAWwyCgK1",
+                        "customer": "cus_7XTKOfHzCqe1DF"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRHzOeafhAar",
+        "path": "/v1/customers/cus_7XTKOfHzCqe1DF",
         "status": 200,
         "response": {
-            "id": "cus_7VDRHzOeafhAar",
+            "id": "cus_7XTKOfHzCqe1DF",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user162@me.com",
+            "email": "user62@me.com",
             "metadata": {
                 "id": "0000000000000000000186e0"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0JKaReE7xLUdtK4zhxIR",
-                        "customer": "cus_7VDRHzOeafhAar"
+                        "id": "card_17IONMKaReE7xLUdAWwyCgK1",
+                        "customer": "cus_7XTKOfHzCqe1DF"
                     }
                 ],
                 "has_more": false
@@ -74,9 +74,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GD0LKaReE7xLUdyUUQP4Mr",
-            "amount": 9900,
-            "customer": "cus_7VDRHzOeafhAar",
+            "id": "ch_17IONOKaReE7xLUd0aFyDghU",
+            "amount": 1000,
+            "customer": "cus_7XTKOfHzCqe1DF",
             "metadata": {
                 "gems": "42000",
                 "timestamp": "2015"
@@ -86,8 +86,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GD0JKaReE7xLUdtK4zhxIR",
-                "customer": "cus_7VDRHzOeafhAar"
+                "id": "card_17IONMKaReE7xLUdAWwyCgK1",
+                "customer": "cus_7XTKOfHzCqe1DF"
             }
         }
     }
diff --git a/spec/fixtures/sub-test-37.json b/spec/fixtures/sub-test-37.json
index 773828a76..7d4e16d42 100644
--- a/spec/fixtures/sub-test-37.json
+++ b/spec/fixtures/sub-test-37.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0LKaReE7xLUdy08w9LuO",
+            "id": "tok_17IONOKaReE7xLUdE1enMeYo",
             "card": {
-                "id": "card_17GD0LKaReE7xLUd4Cm4gxaL"
+                "id": "card_17IONOKaReE7xLUd6rWVbyu4"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDRlNbTkRVP3r",
+            "id": "cus_7XTKfHSexaYNTE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user163@me.com",
+            "email": "user63@me.com",
             "metadata": {
                 "id": "0000000000000000000186e1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0LKaReE7xLUd4Cm4gxaL",
-                        "customer": "cus_7VDRlNbTkRVP3r"
+                        "id": "card_17IONOKaReE7xLUd6rWVbyu4",
+                        "customer": "cus_7XTKfHSexaYNTE"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRlNbTkRVP3r",
+        "path": "/v1/customers/cus_7XTKfHSexaYNTE",
         "status": 200,
         "response": {
-            "id": "cus_7VDRlNbTkRVP3r",
+            "id": "cus_7XTKfHSexaYNTE",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user163@me.com",
+            "email": "user63@me.com",
             "metadata": {
                 "id": "0000000000000000000186e1"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0LKaReE7xLUd4Cm4gxaL",
-                        "customer": "cus_7VDRlNbTkRVP3r"
+                        "id": "card_17IONOKaReE7xLUd6rWVbyu4",
+                        "customer": "cus_7XTKfHSexaYNTE"
                     }
                 ],
                 "has_more": false
@@ -74,9 +74,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GD0MKaReE7xLUdH67q6iml",
-            "amount": 9900,
-            "customer": "cus_7VDRlNbTkRVP3r",
+            "id": "ch_17IONQKaReE7xLUdlE2o5D7S",
+            "amount": 1000,
+            "customer": "cus_7XTKfHSexaYNTE",
             "metadata": {
                 "gems": "42000",
                 "timestamp": "2015"
@@ -86,8 +86,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GD0LKaReE7xLUd4Cm4gxaL",
-                "customer": "cus_7VDRlNbTkRVP3r"
+                "id": "card_17IONOKaReE7xLUd6rWVbyu4",
+                "customer": "cus_7XTKfHSexaYNTE"
             }
         }
     }
diff --git a/spec/fixtures/sub-test-38.json b/spec/fixtures/sub-test-38.json
index 050be9e1e..1ff2c4ddb 100644
--- a/spec/fixtures/sub-test-38.json
+++ b/spec/fixtures/sub-test-38.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0NKaReE7xLUd6Y69uvhH",
+            "id": "tok_17IONRKaReE7xLUdV6bpdM3R",
             "card": {
-                "id": "card_17GD0NKaReE7xLUdvoT4Bxbf"
+                "id": "card_17IONRKaReE7xLUdZX6EiQ7E"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDR4GCxl8RkvD",
+            "id": "cus_7XTK2McruL0dsG",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user164@me.com",
+            "email": "user64@me.com",
             "metadata": {
                 "id": "0000000000000000000186e2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0NKaReE7xLUdvoT4Bxbf",
-                        "customer": "cus_7VDR4GCxl8RkvD"
+                        "id": "card_17IONRKaReE7xLUdZX6EiQ7E",
+                        "customer": "cus_7XTK2McruL0dsG"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDR4GCxl8RkvD",
+        "path": "/v1/customers/cus_7XTK2McruL0dsG",
         "status": 200,
         "response": {
-            "id": "cus_7VDR4GCxl8RkvD",
+            "id": "cus_7XTK2McruL0dsG",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user164@me.com",
+            "email": "user64@me.com",
             "metadata": {
                 "id": "0000000000000000000186e2"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0NKaReE7xLUdvoT4Bxbf",
-                        "customer": "cus_7VDR4GCxl8RkvD"
+                        "id": "card_17IONRKaReE7xLUdZX6EiQ7E",
+                        "customer": "cus_7XTK2McruL0dsG"
                     }
                 ],
                 "has_more": false
@@ -74,9 +74,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GD0OKaReE7xLUdqjX31jEh",
-            "amount": 9900,
-            "customer": "cus_7VDR4GCxl8RkvD",
+            "id": "ch_17IONTKaReE7xLUdGaA9w0vm",
+            "amount": 1000,
+            "customer": "cus_7XTK2McruL0dsG",
             "metadata": {
                 "gems": "42000",
                 "timestamp": "2015"
@@ -86,8 +86,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GD0NKaReE7xLUdvoT4Bxbf",
-                "customer": "cus_7VDR4GCxl8RkvD"
+                "id": "card_17IONRKaReE7xLUdZX6EiQ7E",
+                "customer": "cus_7XTK2McruL0dsG"
             }
         }
     }
diff --git a/spec/fixtures/sub-test-39.json b/spec/fixtures/sub-test-39.json
index 13d779bcd..0046d622a 100644
--- a/spec/fixtures/sub-test-39.json
+++ b/spec/fixtures/sub-test-39.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0OKaReE7xLUdiNcc7Cys",
+            "id": "tok_17IONTKaReE7xLUdK28mW94t",
             "card": {
-                "id": "card_17GD0OKaReE7xLUdDRyoVrtY"
+                "id": "card_17IONTKaReE7xLUddcV1W1ut"
             },
             "type": "card"
         }
@@ -18,19 +18,19 @@
         "path": "/v1/customers",
         "status": 200,
         "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
+            "id": "cus_7XTKEcYWu5ZgzD",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user165@me.com",
+            "email": "user65@me.com",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0OKaReE7xLUdDRyoVrtY",
-                        "customer": "cus_7VDRVYqBwNBHmv"
+                        "id": "card_17IONTKaReE7xLUddcV1W1ut",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
                     }
                 ],
                 "has_more": false
@@ -43,22 +43,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD",
         "status": 200,
         "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
+            "id": "cus_7XTKEcYWu5ZgzD",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user165@me.com",
+            "email": "user65@me.com",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0OKaReE7xLUdDRyoVrtY",
-                        "customer": "cus_7VDRVYqBwNBHmv"
+                        "id": "card_17IONTKaReE7xLUddcV1W1ut",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
                     }
                 ],
                 "has_more": false
@@ -71,20 +71,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv/subscriptions",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD/subscriptions",
         "status": 200,
         "response": {
-            "id": "sub_7VDRuyYXRERHFN",
+            "id": "sub_7XTKfSImhUGC8q",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365378,
-            "current_period_start": 1449686978,
-            "customer": "cus_7VDRVYqBwNBHmv",
+            "current_period_end": 1452885749,
+            "current_period_start": 1450207349,
+            "customer": "cus_7XTKEcYWu5ZgzD",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -92,33 +92,78 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv/subscriptions/sub_7VDRuyYXRERHFN",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD/subscriptions/sub_7XTKfSImhUGC8q",
         "status": 200,
         "response": {
-            "id": "sub_7VDRuyYXRERHFN",
+            "id": "sub_7XTKfSImhUGC8q",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365378,
-            "current_period_start": 1449686978,
-            "customer": "cus_7VDRVYqBwNBHmv",
+            "current_period_end": 1452885749,
+            "current_period_start": 1450207349,
+            "customer": "cus_7XTKEcYWu5ZgzD",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
     },
+    {
+        "scope": "https://api.stripe.com:443",
+        "method": "POST",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD",
+        "status": 200,
+        "response": {
+            "id": "cus_7XTKEcYWu5ZgzD",
+            "alipay_accounts": {
+                "has_more": false
+            },
+            "email": "user65@me.com",
+            "metadata": {
+                "id": "0000000000000000000186e3"
+            },
+            "sources": {
+                "data": [
+                    {
+                        "id": "card_17IONTKaReE7xLUddcV1W1ut",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
+                    }
+                ],
+                "has_more": false
+            },
+            "subscriptions": {
+                "data": [
+                    {
+                        "id": "sub_7XTKfSImhUGC8q",
+                        "cancel_at_period_end": false,
+                        "current_period_end": 1452885749,
+                        "current_period_start": 1450207349,
+                        "customer": "cus_7XTKEcYWu5ZgzD",
+                        "metadata": {
+                            "id": "0000000000000000000186e3"
+                        },
+                        "plan": {
+                            "id": "basic",
+                            "amount": 100
+                        },
+                        "quantity": 1
+                    }
+                ],
+                "has_more": false
+            }
+        }
+    },
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0RKaReE7xLUdo8pKXEBA",
+            "id": "tok_17IONYKaReE7xLUdgUBrUkeS",
             "card": {
-                "id": "card_17GD0RKaReE7xLUd29ankyPW"
+                "id": "card_17IONYKaReE7xLUdZOhgiGAX"
             },
             "type": "card"
         }
@@ -126,22 +171,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD",
         "status": 200,
         "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
+            "id": "cus_7XTKEcYWu5ZgzD",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user165@me.com",
+            "email": "user65@me.com",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0OKaReE7xLUdDRyoVrtY",
-                        "customer": "cus_7VDRVYqBwNBHmv"
+                        "id": "card_17IONTKaReE7xLUddcV1W1ut",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
                     }
                 ],
                 "has_more": false
@@ -149,17 +194,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDRuyYXRERHFN",
+                        "id": "sub_7XTKfSImhUGC8q",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365378,
-                        "current_period_start": 1449686978,
-                        "customer": "cus_7VDRVYqBwNBHmv",
+                        "current_period_end": 1452885749,
+                        "current_period_start": 1450207349,
+                        "customer": "cus_7XTKEcYWu5ZgzD",
                         "metadata": {
                             "id": "0000000000000000000186e3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -171,22 +216,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD",
         "status": 200,
         "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
+            "id": "cus_7XTKEcYWu5ZgzD",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user165@me.com",
+            "email": "user65@me.com",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0OKaReE7xLUdDRyoVrtY",
-                        "customer": "cus_7VDRVYqBwNBHmv"
+                        "id": "card_17IONYKaReE7xLUdZOhgiGAX",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
                     }
                 ],
                 "has_more": false
@@ -194,62 +239,17 @@
             "subscriptions": {
                 "data": [
                     {
-                        "id": "sub_7VDRuyYXRERHFN",
+                        "id": "sub_7XTKfSImhUGC8q",
                         "cancel_at_period_end": false,
-                        "current_period_end": 1452365378,
-                        "current_period_start": 1449686978,
-                        "customer": "cus_7VDRVYqBwNBHmv",
+                        "current_period_end": 1452885749,
+                        "current_period_start": 1450207349,
+                        "customer": "cus_7XTKEcYWu5ZgzD",
                         "metadata": {
                             "id": "0000000000000000000186e3"
                         },
                         "plan": {
                             "id": "basic",
-                            "amount": 999
-                        },
-                        "quantity": 1
-                    }
-                ],
-                "has_more": false
-            }
-        }
-    },
-    {
-        "scope": "https://api.stripe.com:443",
-        "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv",
-        "status": 200,
-        "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
-            "alipay_accounts": {
-                "has_more": false
-            },
-            "email": "user165@me.com",
-            "metadata": {
-                "id": "0000000000000000000186e3"
-            },
-            "sources": {
-                "data": [
-                    {
-                        "id": "card_17GD0RKaReE7xLUd29ankyPW",
-                        "customer": "cus_7VDRVYqBwNBHmv"
-                    }
-                ],
-                "has_more": false
-            },
-            "subscriptions": {
-                "data": [
-                    {
-                        "id": "sub_7VDRuyYXRERHFN",
-                        "cancel_at_period_end": false,
-                        "current_period_end": 1452365378,
-                        "current_period_start": 1449686978,
-                        "customer": "cus_7VDRVYqBwNBHmv",
-                        "metadata": {
-                            "id": "0000000000000000000186e3"
-                        },
-                        "plan": {
-                            "id": "basic",
-                            "amount": 999
+                            "amount": 100
                         },
                         "quantity": 1
                     }
@@ -261,22 +261,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "GET",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv/subscriptions",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD/subscriptions",
         "status": 200,
         "response": {
             "data": [
                 {
-                    "id": "sub_7VDRuyYXRERHFN",
+                    "id": "sub_7XTKfSImhUGC8q",
                     "cancel_at_period_end": false,
-                    "current_period_end": 1452365378,
-                    "current_period_start": 1449686978,
-                    "customer": "cus_7VDRVYqBwNBHmv",
+                    "current_period_end": 1452885749,
+                    "current_period_start": 1450207349,
+                    "customer": "cus_7XTKEcYWu5ZgzD",
                     "metadata": {
                         "id": "0000000000000000000186e3"
                     },
                     "plan": {
                         "id": "basic",
-                        "amount": 999
+                        "amount": 100
                     },
                     "quantity": 1
                 }
@@ -287,20 +287,20 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "DELETE",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv/subscriptions/sub_7VDRuyYXRERHFN",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD/subscriptions/sub_7XTKfSImhUGC8q",
         "status": 200,
         "response": {
-            "id": "sub_7VDRuyYXRERHFN",
+            "id": "sub_7XTKfSImhUGC8q",
             "cancel_at_period_end": false,
-            "current_period_end": 1452365378,
-            "current_period_start": 1449686978,
-            "customer": "cus_7VDRVYqBwNBHmv",
+            "current_period_end": 1452885749,
+            "current_period_start": 1450207349,
+            "customer": "cus_7XTKEcYWu5ZgzD",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "plan": {
                 "id": "basic",
-                "amount": 999
+                "amount": 100
             },
             "quantity": 1
         }
@@ -308,22 +308,22 @@
     {
         "scope": "https://api.stripe.com:443",
         "method": "POST",
-        "path": "/v1/customers/cus_7VDRVYqBwNBHmv",
+        "path": "/v1/customers/cus_7XTKEcYWu5ZgzD",
         "status": 200,
         "response": {
-            "id": "cus_7VDRVYqBwNBHmv",
+            "id": "cus_7XTKEcYWu5ZgzD",
             "alipay_accounts": {
                 "has_more": false
             },
-            "email": "user165@me.com",
+            "email": "user65@me.com",
             "metadata": {
                 "id": "0000000000000000000186e3"
             },
             "sources": {
                 "data": [
                     {
-                        "id": "card_17GD0RKaReE7xLUd29ankyPW",
-                        "customer": "cus_7VDRVYqBwNBHmv"
+                        "id": "card_17IONYKaReE7xLUdZOhgiGAX",
+                        "customer": "cus_7XTKEcYWu5ZgzD"
                     }
                 ],
                 "has_more": false
@@ -339,9 +339,9 @@
         "path": "/v1/charges",
         "status": 200,
         "response": {
-            "id": "ch_17GD0TKaReE7xLUdd4be3O6z",
-            "amount": 9900,
-            "customer": "cus_7VDRVYqBwNBHmv",
+            "id": "ch_17IONbKaReE7xLUdNypAKyNH",
+            "amount": 1000,
+            "customer": "cus_7XTKEcYWu5ZgzD",
             "metadata": {
                 "gems": "42000",
                 "timestamp": "2015"
@@ -351,8 +351,8 @@
                 "has_more": false
             },
             "source": {
-                "id": "card_17GD0RKaReE7xLUd29ankyPW",
-                "customer": "cus_7VDRVYqBwNBHmv"
+                "id": "card_17IONYKaReE7xLUdZOhgiGAX",
+                "customer": "cus_7XTKEcYWu5ZgzD"
             }
         }
     }
diff --git a/spec/fixtures/sub-test-40.json b/spec/fixtures/sub-test-40.json
index 9b0fa0146..e69f388c6 100644
--- a/spec/fixtures/sub-test-40.json
+++ b/spec/fixtures/sub-test-40.json
@@ -5,9 +5,9 @@
         "path": "/v1/tokens",
         "status": 200,
         "response": {
-            "id": "tok_17GD0UKaReE7xLUdREQ2VEUm",
+            "id": "tok_17IONcKaReE7xLUduia9feWe",
             "card": {
-                "id": "card_17GD0UKaReE7xLUdL9YrUxgz"
+                "id": "card_17IONcKaReE7xLUd3x5aNKDL"
             },
             "type": "card"
         }
diff --git a/spec/helpers/helper.js b/spec/helpers/helper.js
index 76664a21c..4ad741bb7 100644
--- a/spec/helpers/helper.js
+++ b/spec/helpers/helper.js
@@ -67,5 +67,14 @@ describe('Server Test Helper', function() {
       if (err) { console.log(err); }
       done(); 
     });
+  });
+    
+  it('initializes products', function(done) {
+    var request = require('request');
+    request.get(getURL('/db/products'), function(err, res, body) {
+      expect(err).toBe(null);
+      expect(res.statusCode).toBe(200);
+      done();
+    });
   })
 });
\ No newline at end of file
diff --git a/spec/server/functional/achievement.spec.coffee b/spec/server/functional/achievement.spec.coffee
index e6e4c6a9f..9318678b2 100644
--- a/spec/server/functional/achievement.spec.coffee
+++ b/spec/server/functional/achievement.spec.coffee
@@ -220,14 +220,16 @@ describe 'Recalculate Achievements', ->
   EarnedAchievementHandler = require '../../../server/achievements/earned_achievement_handler'
 
   it 'remove earned achievements', (done) ->
-    clearModels [EarnedAchievement], (err) ->
-      expect(err).toBeNull()
-      EarnedAchievement.find {}, (err, earned) ->
-        expect(earned.length).toBe 0
-
-        User.update {}, {$set: {points: 0}}, {multi:true}, (err) ->
-          expect(err).toBeNull()
-          done()
+    f = ->
+      clearModels [EarnedAchievement], (err) ->
+        expect(err).toBeNull()
+        EarnedAchievement.find {}, (err, earned) ->
+          expect(earned.length).toBe 0
+  
+          User.update {}, {$set: {points: 0}}, {multi:true}, (err) ->
+            expect(err).toBeNull()
+            done()
+    setTimeout f, 100 # wait for previous tests to wrap up to avoid race condition
 
   it 'can not be accessed by regular users', (done) ->
     loginJoe -> request.post {uri:getURL '/admin/earned_achievement/recalculate'}, (err, res, body) ->
diff --git a/spec/server/functional/payment.spec.coffee b/spec/server/functional/payment.spec.coffee
index f1adba083..7952752dd 100644
--- a/spec/server/functional/payment.spec.coffee
+++ b/spec/server/functional/payment.spec.coffee
@@ -124,7 +124,7 @@ describe '/db/payment', ->
               expect(body.stripe.timestamp).toBe(timestamp)
               expect(body.stripe.customerID).toBeDefined()
               expect(body.gems).toBe(5000)
-              expect(body.amount).toBe(499)
+              expect(body.amount).toBe(100)
               expect(body.productID).toBe('gems_5')
               expect(body.service).toBe('stripe')
               expect(body.recipient).toBe(joeID)
diff --git a/spec/server/functional/prepaid.spec.coffee b/spec/server/functional/prepaid.spec.coffee
index 31c7a9a7e..bb653794b 100644
--- a/spec/server/functional/prepaid.spec.coffee
+++ b/spec/server/functional/prepaid.spec.coffee
@@ -565,7 +565,7 @@ describe '/db/prepaid', ->
           expect(err).toBeNull()
           expect(payments).not.toBeNull()
           expect(payments.length).toEqual(1)
-          expect(payments[0].get('amount')).toEqual(8991)
+          expect(payments[0].get('amount')).toEqual(900)
           done()
 
     it 'Anonymous cant redeem a prepaid code', (done) ->
@@ -717,9 +717,7 @@ describe '/db/prepaid', ->
           expect(res.statusCode).not.toEqual(200)
           done()
 
-    # TODO: Fix this server test
-          
-    xit 'Test a bunch of people trying to redeem at once', (done) ->
+    it 'Test a bunch of people trying to redeem at once', (done) ->
       nockUtils.setupNock 'db-sub-redeem-test-3.json', (err, nockDone) ->
         doRedeem = (userX, code, testnum, retry, fnDone) =>
           loginUser userX, () =>
diff --git a/spec/server/functional/subscription.spec.coffee b/spec/server/functional/subscription.spec.coffee
index 15ed861f0..fe8fa5143 100644
--- a/spec/server/functional/subscription.spec.coffee
+++ b/spec/server/functional/subscription.spec.coffee
@@ -20,8 +20,8 @@ invoiceChargeSampleEvent = {
       period_start: 1417574897,
       period_end: 1417574897,
       lines: {},
-      subtotal: 999,
-      total: 999,
+      subtotal: 100,
+      total: 100,
       customer: 'cus_5Fz9MVWP2bDPGV',
       object: 'invoice',
       attempted: true,
@@ -30,7 +30,7 @@ invoiceChargeSampleEvent = {
       paid: true,
       livemode: false,
       attempt_count: 1,
-      amount_due: 999,
+      amount_due: 100,
       currency: 'usd',
       starting_balance: 0,
       ending_balance: 0,
@@ -246,7 +246,7 @@ describe 'Subscriptions', ->
   userURL = getURL('/db/user')
   webhookURL = getURL('/stripe/webhook')
   headers = {'X-Change-Plan': 'true'}
-  subPrice = 999
+  subPrice = 100
   subGems = 3500
   invoicesWebHooked = {}
   afterEach nockUtils.teardownNock
diff --git a/test/app/lib/LevelLoader.spec.coffee b/test/app/lib/LevelLoader.spec.coffee
index 244358aac..c23e18fa9 100644
--- a/test/app/lib/LevelLoader.spec.coffee
+++ b/test/app/lib/LevelLoader.spec.coffee
@@ -143,7 +143,7 @@ describe 'LevelLoader', ->
     jasmine.Ajax.requests.sendResponses(responses)
     requests = jasmine.Ajax.requests.all()
     urls = (r.url for r in requests)
-    expect('/db/thang.type/mace/version?project=name,components,original,rasterIcon,kind' in urls).toBeTruthy()
+    expect('/db/thang.type/mace/version?project=name,components,original,rasterIcon,kind,prerenderedSpriteSheetData' in urls).toBeTruthy()
 
   it 'loads components which are inherited by level thangs from thang type default components', ->
     new LevelLoader({supermodel:new SuperModel(), sessionID: 'id', levelID: 'id'})
@@ -167,7 +167,7 @@ describe 'LevelLoader', ->
     jasmine.Ajax.requests.sendResponses(responses)
     requests = jasmine.Ajax.requests.all()
     urls = (r.url for r in requests)
-    expect('/db/thang.type/wand/version?project=name,components,original,rasterIcon,kind' in urls).toBeTruthy()
+    expect('/db/thang.type/wand/version?project=name,components,original,rasterIcon,kind,prerenderedSpriteSheetData' in urls).toBeTruthy()
 
   it 'loads components for item thang types which are inherited by level thangs from thang type default equips component configs', ->
     new LevelLoader({supermodel:new SuperModel(), sessionID: 'id', levelID: 'id'})