Merge branch 'code_reorg'

1 files changed, 7 insertions, 11 deletions

diff --git a/routes/calculator.js b/routes/calculator.js
index 3e067df6..6c9517f3 100644
--- a/routes/calculator.js
+++ b/routes/calculator.js
@@ -1,18 +1,14 @@
 (function() {
-  exports["new"] = function(req, res) {
-    return res.render('calculator/setup');
-  };
-
   exports.sweep = function(req, res) {
     return res.render('calculator/sweep', {
-      layout: 'layout'
-    });
-  };
-
-  exports.show = function(req, res) {
-    return res.render('calculator/show', {
       layout: 'layout',
-      x: 'meow'
+      navigation: true,
+      js: (function() {
+        return global.js;
+      }),
+      css: (function() {
+        return global.css;
+      })
     });
   };