diff --git a/include/chaiscript/chaiscript_threading.hpp b/include/chaiscript/chaiscript_threading.hpp
index bce2c3e..bd34ef3 100644
--- a/include/chaiscript/chaiscript_threading.hpp
+++ b/include/chaiscript/chaiscript_threading.hpp
@@ -72,10 +72,6 @@ namespace chaiscript
         class Thread_Storage
         {
           public:
-            ~Thread_Storage()
-            {
-            }
-
             inline T *operator->() const
             {
               return get_tls().get();
@@ -92,7 +88,7 @@ namespace chaiscript
             {
               unique_lock<mutex> lock(m_mutex);
              
-              typename std::map<std::thread::id, std::shared_ptr<T> >::iterator itr = m_instances.find(std::this_thread::get_id());
+              auto itr = m_instances.find(std::this_thread::get_id());
 
               if (itr != m_instances.end()) { return itr->second; }
              
diff --git a/include/chaiscript/dispatchkit/any.hpp b/include/chaiscript/dispatchkit/any.hpp
index a6cce3d..90b6336 100644
--- a/include/chaiscript/dispatchkit/any.hpp
+++ b/include/chaiscript/dispatchkit/any.hpp
@@ -19,15 +19,15 @@ namespace chaiscript {
       class bad_any_cast : public std::bad_cast
       {
         public:
-          bad_any_cast() throw()
+          bad_any_cast() noexcept
             : m_what("bad any cast")
           {
           }
 
-          virtual ~bad_any_cast() throw() {}
+          virtual ~bad_any_cast() noexcept {}
 
           /// \brief Description of what error occured
-          virtual const char * what() const throw()
+          virtual const char * what() const noexcept
           {
             return m_what.c_str();
           }
@@ -79,7 +79,7 @@ namespace chaiscript {
 
       public:
         // construct/copy/destruct
-        Any() {}
+        Any() = default;
 
         Any(const Any &t_any) 
         { 
diff --git a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
index ef26d0b..53200c0 100644
--- a/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
+++ b/include/chaiscript/dispatchkit/bad_boxed_cast.hpp
@@ -22,25 +22,25 @@ namespace chaiscript
     {
       public:
         bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to,
-            const std::string &t_what) throw()
+            const std::string &t_what) noexcept
           : from(t_from), to(&t_to), m_what(t_what)
         {
         }
 
-        bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to) throw()
+        bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
           : from(t_from), to(&t_to), m_what("Cannot perform boxed_cast")
         {
         }
 
-        bad_boxed_cast(const std::string &t_what) throw()
+        bad_boxed_cast(const std::string &t_what) noexcept
           : m_what(t_what)
         {
         }
 
-        virtual ~bad_boxed_cast() throw() {}
+        virtual ~bad_boxed_cast() noexcept {} 
 
         /// \brief Description of what error occured
-        virtual const char * what() const throw()
+        virtual const char * what() const noexcept
         {
           return m_what.c_str();
         }
diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
index 3269809..6be8a1b 100644
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -289,7 +289,7 @@ namespace chaiscript
 
       static bool has_guard(const Const_Proxy_Function &t_pf)
       {
-        std::shared_ptr<const dispatch::Dynamic_Proxy_Function> pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
+        auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
         if (pf)
         {
           return bool(pf->get_guard());
@@ -300,7 +300,7 @@ namespace chaiscript
 
       static Const_Proxy_Function get_guard(const Const_Proxy_Function &t_pf)
       {
-        std::shared_ptr<const dispatch::Dynamic_Proxy_Function> pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
+        auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
         if (pf)
         {
           if (pf->get_guard())
@@ -318,7 +318,9 @@ namespace chaiscript
         throw bv;
       }
       
-      static std::shared_ptr<chaiscript::detail::Dispatch_Engine> bootstrap2(std::shared_ptr<chaiscript::detail::Dispatch_Engine> e = std::shared_ptr<chaiscript::detail::Dispatch_Engine> (new chaiscript::detail::Dispatch_Engine()))
+      static std::shared_ptr<chaiscript::detail::Dispatch_Engine> bootstrap2(
+          std::shared_ptr<chaiscript::detail::Dispatch_Engine> e 
+             = std::shared_ptr<chaiscript::detail::Dispatch_Engine> (new chaiscript::detail::Dispatch_Engine()))
       {
         e->add(user_type<void>(), "void");
         return e;
diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index 1d51639..257379e 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -41,12 +41,12 @@ namespace chaiscript
     class reserved_word_error : public std::runtime_error
     {
       public:
-        reserved_word_error(const std::string &t_word) throw()
+        reserved_word_error(const std::string &t_word) noexcept
           : std::runtime_error("Reserved word not allowed in object name: " + t_word), m_word(t_word)
         {
         }
 
-        virtual ~reserved_word_error() throw() {}
+        virtual ~reserved_word_error() noexcept {}
 
         std::string word() const
         {
@@ -64,12 +64,12 @@ namespace chaiscript
     class global_non_const : public std::runtime_error
     {
       public:
-        global_non_const() throw()
+        global_non_const() noexcept
           : std::runtime_error("a global object must be const")
         {
         }
 
-        virtual ~global_non_const() throw() {}
+        virtual ~global_non_const() noexcept {}
     };
   }
 
diff --git a/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp b/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
index f6fb7bf..9fce9cf 100644
--- a/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
+++ b/include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
@@ -20,22 +20,22 @@ namespace chaiscript
     {
       public:
         bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to,
-            const std::string &t_what) throw()
+            const std::string &t_what) noexcept
           : bad_boxed_cast(t_from, t_to, t_what)
         {
         }
 
-        bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) throw()
+        bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
           : bad_boxed_cast(t_from, t_to)
         {
         }
 
-        bad_boxed_dynamic_cast(const std::string &w) throw()
+        bad_boxed_dynamic_cast(const std::string &w) noexcept
           : bad_boxed_cast(w)
         {
         }
 
-        virtual ~bad_boxed_dynamic_cast() throw() {}
+        virtual ~bad_boxed_dynamic_cast() noexcept {}
     };
   }
 
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index 5225121..aa5ba0e 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -188,11 +188,11 @@ namespace chaiscript
     class guard_error : public std::runtime_error
     {
       public:
-        guard_error() throw()
+        guard_error() noexcept
           : std::runtime_error("Guard evaluation failed")
         { }
 
-        virtual ~guard_error() throw()
+        virtual ~guard_error() noexcept
         { }
     };
   }
@@ -587,17 +587,17 @@ namespace chaiscript
     class dispatch_error : public std::runtime_error
     {
       public:
-        dispatch_error() throw()
+        dispatch_error() noexcept
           : std::runtime_error("No matching function to dispatch to")
         {
         }
 
-        dispatch_error(bool is_const) throw()
+        dispatch_error(bool is_const) noexcept
           : std::runtime_error(std::string("No matching function to dispatch to") + (is_const?", parameter is const":""))
           {
           }
 
-        virtual ~dispatch_error() throw() {}
+        virtual ~dispatch_error() noexcept {}
     };
   } 
 
diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
index 6900f14..f8901e3 100644
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -32,7 +32,7 @@ namespace chaiscript
       {
       }
 
-      virtual ~arity_error() throw() {}
+      virtual ~arity_error() noexcept {}
 
       int got;
       int expected;
diff --git a/include/chaiscript/language/chaiscript_common.hpp b/include/chaiscript/language/chaiscript_common.hpp
index dec2754..74fb410 100644
--- a/include/chaiscript/language/chaiscript_common.hpp
+++ b/include/chaiscript/language/chaiscript_common.hpp
@@ -70,17 +70,17 @@ namespace chaiscript
       std::string filename;
       std::vector<AST_NodePtr> call_stack;
 
-      eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) throw() :
+      eval_error(const std::string &t_why, const File_Position &t_where, const std::string &t_fname) noexcept :
         std::runtime_error(format(t_why, t_where, t_fname)),
         reason(t_why), start_position(t_where), end_position(t_where), filename(t_fname)
         { }
 
-      eval_error(const std::string &t_why) throw()
+      eval_error(const std::string &t_why) noexcept
         : std::runtime_error("Error: \"" + t_why + "\" "),
         reason(t_why) 
       {}
 
-      virtual ~eval_error() throw() {}
+      virtual ~eval_error() noexcept {}
 
     private:
       static std::string format(const std::string &t_why, const File_Position &t_where, const std::string &t_fname)
@@ -98,11 +98,11 @@ namespace chaiscript
      * Errors generated when loading a file
      */
     struct file_not_found_error : public std::runtime_error {
-      file_not_found_error(const std::string &t_filename) throw()
+      file_not_found_error(const std::string &t_filename) noexcept
         : std::runtime_error("File Not Found: " + t_filename)
       { }
 
-      virtual ~file_not_found_error() throw() {}
+      virtual ~file_not_found_error() noexcept {}
     };
 
   }
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index 6ea22fb..aeeba9e 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -35,12 +35,12 @@ namespace chaiscript
     /// \brief Thrown if an error occurs while attempting to load a binary module
     struct load_module_error : std::runtime_error
     {
-      load_module_error(const std::string &t_reason) throw()
+      load_module_error(const std::string &t_reason) noexcept
         : std::runtime_error(t_reason)
       {
       }
 
-      virtual ~load_module_error() throw()
+      virtual ~load_module_error() noexcept
       {
       }
     };
diff --git a/unittests/bind.chai b/unittests/bind.chai
index 3c72673..a3af300 100644
--- a/unittests/bind.chai
+++ b/unittests/bind.chai
@@ -1,2 +1,2 @@
-var prod = bind(foldl, _, `*`, 1.0)
+auto prod = bind(foldl, _, `*`, 1.0)
 assert_equal(60, prod([3, 4, 5]))
diff --git a/unittests/bind2.chai b/unittests/bind2.chai
index 0b8ddde..1adf6b8 100644
--- a/unittests/bind2.chai
+++ b/unittests/bind2.chai
@@ -6,11 +6,11 @@ def add(x, y)
 
 assert_equal(2, add.get_arity());
 
-var b = bind(add, 2, _);
+auto b = bind(add, 2, _);
 
 assert_equal(1, b.get_arity());
 
-var c = bind(b, 3);
+auto c = bind(b, 3);
 
 assert_equal(0, c.get_arity());
 
@@ -22,13 +22,13 @@ def concat2(a,b,c,d)
   return to_string(a) + to_string(b) + to_string(c) + to_string(d);
 }
 
-var d = bind(concat2, _, " Hello ", _, " World");
+auto d = bind(concat2, _, " Hello ", _, " World");
 assert_equal(2, d.get_arity());
 
 assert_equal("1 Hello 3 World", d(1,3));
 
-var e = bind(`<`, _, 5);
-var types = e.get_param_types();
+auto e = bind(`<`, _, 5);
+auto types = e.get_param_types();
 assert_equal(2, types.size());
 assert_equal(true, types[0].bare_equal(bool_type));
 
diff --git a/unittests/break_while.chai b/unittests/break_while.chai
index d54a3dd..bfede2c 100644
--- a/unittests/break_while.chai
+++ b/unittests/break_while.chai
@@ -1,4 +1,4 @@
-var i = 0
+auto i = 0
 while (i < 10) {
 	if (++i == 5) {
 		break
diff --git a/unittests/classification.chai b/unittests/classification.chai
index 8c2cca9..cc56fbe 100644
--- a/unittests/classification.chai
+++ b/unittests/classification.chai
@@ -3,5 +3,5 @@ assert_equal(false, 1.is_var_reference());
 assert_equal(true, 1.is_var_pointer());
 assert_equal(false, 1.is_var_null());
 assert_equal(false, 1.is_var_undef());
-var i;
+auto i;
 assert_equal(true, i.is_var_undef());
diff --git a/unittests/collate.chai b/unittests/collate.chai
index 12632e5..3a32973 100644
--- a/unittests/collate.chai
+++ b/unittests/collate.chai
@@ -1,3 +1,3 @@
-var v = collate(1, 2)
+auto v = collate(1, 2)
 assert_equal(1, v[0])
 assert_equal(2, v[1])
diff --git a/unittests/concat.chai b/unittests/concat.chai
index 3d285a5..53950a6 100644
--- a/unittests/concat.chai
+++ b/unittests/concat.chai
@@ -1,4 +1,4 @@
-var v = concat([1, 2], [3, 4]);
+auto v = concat([1, 2], [3, 4]);
 
 assert_equal(4, v.size());
 assert_equal(1, v[0]);
diff --git a/unittests/deep_array_lookup.chai b/unittests/deep_array_lookup.chai
index c405302..8a86eaa 100644
--- a/unittests/deep_array_lookup.chai
+++ b/unittests/deep_array_lookup.chai
@@ -1,4 +1,4 @@
-var a = [1,2,3, [4,5,6] ]
+auto a = [1,2,3, [4,5,6] ]
 
 assert_equal(a[3][0], 4)
 
@@ -6,6 +6,6 @@ assert_equal(a[3][0], 4)
 def Test::Test() { this.a = [1,2,3]; }
 attr Test::a;
 
-var t = Test();
+auto t = Test();
 
 assert_equal(t.a[0], 1)
diff --git a/unittests/dispatch_functions.chai b/unittests/dispatch_functions.chai
index 528d5b3..1887844 100644
--- a/unittests/dispatch_functions.chai
+++ b/unittests/dispatch_functions.chai
@@ -6,6 +6,6 @@ assert_equal(get_arity.get_contained_functions().size(), 0);
 assert_equal(get_arity.get_arity(), 1);
 assert_equal(get_arity.get_param_types().size(), 2);
 
-var paramtypes = get_arity.get_param_types();
+auto paramtypes = get_arity.get_param_types();
 
 assert_equal(true, paramtypes[1].bare_equal(Function_type));
diff --git a/unittests/dynamic_object_test.cpp b/unittests/dynamic_object_test.cpp
index 8383e03..ca0ffae 100644
--- a/unittests/dynamic_object_test.cpp
+++ b/unittests/dynamic_object_test.cpp
@@ -17,7 +17,7 @@ int main()
 
   chaiscript::ChaiScript chai;
 
-  chai("attr bob::z; def bob::bob() { this.z = 10 }; var x = bob()");
+  chai("attr bob::z; def bob::bob() { this.z = 10 }; auto x = bob()");
 
   chaiscript::dispatch::Dynamic_Object &mydo = chai.eval<chaiscript::dispatch::Dynamic_Object &>("x");
 
diff --git a/unittests/equ_shortform.chai b/unittests/equ_shortform.chai
index 41c8e1d..b7ec906 100644
--- a/unittests/equ_shortform.chai
+++ b/unittests/equ_shortform.chai
@@ -1,4 +1,4 @@
-var x=.5
+auto x=.5
 assert_equal(.5, x)
-var y=-.5
+auto y=-.5
 assert_equal(-.5, y)
diff --git a/unittests/eval_error.chai b/unittests/eval_error.chai
index d63ad75..b2737a1 100644
--- a/unittests/eval_error.chai
+++ b/unittests/eval_error.chai
@@ -20,7 +20,7 @@ def func()
 
 def doing()
 {
-  for (var i = 0; i < 10; ++i)
+  for (auto i = 0; i < 10; ++i)
   {
     func();
   }
@@ -34,6 +34,6 @@ def while_doing()
   }
 }
 
-var f = fun() { while_doing(); }
+auto f = fun() { while_doing(); }
 
 assert_equal(get_eval_error(f).call_stack.size(), 16)
diff --git a/unittests/exception.chai b/unittests/exception.chai
index 50df6a8..94e82d8 100644
--- a/unittests/exception.chai
+++ b/unittests/exception.chai
@@ -1,4 +1,4 @@
-var x = 1
+auto x = 1
 try {
   throw(x)
   x = 2
diff --git a/unittests/exception_finally.chai b/unittests/exception_finally.chai
index d6fd834..76003c6 100644
--- a/unittests/exception_finally.chai
+++ b/unittests/exception_finally.chai
@@ -1,4 +1,4 @@
-var finallyone = false;
+auto finallyone = false;
 
 try {
   throw(3)
@@ -12,9 +12,9 @@ finally {
 
 assert_equal(true, finallyone);
 
-var try2 = false;
-var catch2 = false;
-var finally2 = false;
+auto try2 = false;
+auto catch2 = false;
+auto finally2 = false;
 
 
 try {
diff --git a/unittests/exception_guards.chai b/unittests/exception_guards.chai
index 99cd901..1279298 100644
--- a/unittests/exception_guards.chai
+++ b/unittests/exception_guards.chai
@@ -1,6 +1,6 @@
-var results = [];
+auto results = [];
 
-for (var i = 2; i < 6; ++i) {
+for (auto i = 2; i < 6; ++i) {
   try {
     throw(i)
   }
diff --git a/unittests/for.chai b/unittests/for.chai
index 9799be2..c576999 100644
--- a/unittests/for.chai
+++ b/unittests/for.chai
@@ -1,6 +1,6 @@
-var ret = []
+auto ret = []
 
-for (var i = 0; i < 5; ++i) {
+for (auto i = 0; i < 5; ++i) {
   ret.push_back(i);
 }
 
diff --git a/unittests/for_each_range.chai b/unittests/for_each_range.chai
index 43191bf..3a92641 100644
--- a/unittests/for_each_range.chai
+++ b/unittests/for_each_range.chai
@@ -1,3 +1,3 @@
-var v = [1,2,3];
-var r = range(v);
+auto v = [1,2,3];
+auto r = range(v);
 for_each(r, fun(x) { assert_equal(true, x>0); } )
diff --git a/unittests/for_each_retro.chai b/unittests/for_each_retro.chai
index cc27a58..4cd0ff5 100644
--- a/unittests/for_each_retro.chai
+++ b/unittests/for_each_retro.chai
@@ -1,4 +1,4 @@
 // Don't bother checking the output from this one, just makes sure it executes
-var v = [1,2,3];
-var r = retro(range(v));
+auto v = [1,2,3];
+auto r = retro(range(v));
 for_each(r, print)
diff --git a/unittests/function_introspection.chai b/unittests/function_introspection.chai
index 5ad76fc..6d808df 100644
--- a/unittests/function_introspection.chai
+++ b/unittests/function_introspection.chai
@@ -31,7 +31,7 @@ assert_equal(test_fun.get_arity(), 1);
 assert_equal(test_fun.get_contained_functions.size(), 1);
 assert_equal(test_fun.get_param_types().size(), 2);
 assert_equal(test_fun, test_fun);
-var test_fun_types = test_fun.get_param_types();
+auto test_fun_types = test_fun.get_param_types();
 assert_equal(true, test_fun_types[0].bare_equal(Object_type));
 assert_equal(true, test_fun_types[1].bare_equal(int_type));
 
@@ -42,7 +42,7 @@ assert_equal(2, `==`.get_arity());
 
 // < should be the merging of two functions bool <(PODObject, PODObject) and bool <(string, string)
 // we want to peel it apart and make sure that's true
-var types = `<`.get_param_types();
+auto types = `<`.get_param_types();
 assert_equal(3, types.size());
 assert_equal(true, types[0].bare_equal(bool_type));
 assert_equal(true, types[1].bare_equal(Object_type));
@@ -62,7 +62,7 @@ assert_equal(true, with_guard.has_guard());
 assert_equal(false, without_guard.has_guard());
 
 assert_equal(2, group_guard.get_contained_functions().size());
-var group = group_guard.get_contained_functions();
+auto group = group_guard.get_contained_functions();
 
 assert_equal(true, group[0].has_guard())
 assert_equal(false, group[1].has_guard())
@@ -70,7 +70,7 @@ assert_equal(false, group[1].has_guard())
 assert_throws("Function does not have a guard", fun() { group[0].get_guard(); } );
 assert_throws("Function does not have a guard", fun() { without_guard.get_guard(); } );
 
-var guard = with_guard.get_guard();
+auto guard = with_guard.get_guard();
 
 assert_equal(false, guard.has_guard());
 assert_throws("Function does not have a guard", fun() { guard.get_guard(); } );
diff --git a/unittests/function_ordering_test.cpp b/unittests/function_ordering_test.cpp
index 0a9652c..e80f4d3 100644
--- a/unittests/function_ordering_test.cpp
+++ b/unittests/function_ordering_test.cpp
@@ -22,7 +22,7 @@ int main()
   chai.add(chaiscript::fun(&test_two), "test_fun");
 
   int res1 = chai.eval<int>("test_fun(1)");
-  int res2 = chai.eval<int>("var i = 1; test_fun(i)");
+  int res2 = chai.eval<int>("auto i = 1; test_fun(i)");
   int res3 = chai.eval<int>("test_fun(\"bob\")");
   int res4 = chai.eval<int>("test_fun(\"hi\")");
 
diff --git a/unittests/function_reassignment.chai b/unittests/function_reassignment.chai
index 2a885fd..6ddbce3 100644
--- a/unittests/function_reassignment.chai
+++ b/unittests/function_reassignment.chai
@@ -1,3 +1,3 @@
-var x = `+`
+auto x = `+`
 x = `-`
 assert_equal(1, x(5,4))
diff --git a/unittests/if.chai b/unittests/if.chai
index 3ec7321..c424929 100644
--- a/unittests/if.chai
+++ b/unittests/if.chai
@@ -1,4 +1,4 @@
-var t = false;
+auto t = false;
 
 if (true) {
   t = true;
diff --git a/unittests/if_else.chai b/unittests/if_else.chai
index 8cb42db..611ee91 100644
--- a/unittests/if_else.chai
+++ b/unittests/if_else.chai
@@ -1,6 +1,6 @@
-var i = 3
-var b1 = false;
-var b2 = false;
+auto i = 3
+auto b1 = false;
+auto b2 = false;
 
 if (i == 2) {
   b1 = true;
diff --git a/unittests/if_elseif.chai b/unittests/if_elseif.chai
index 75b85b5..7e4b5d5 100644
--- a/unittests/if_elseif.chai
+++ b/unittests/if_elseif.chai
@@ -1,8 +1,8 @@
-var b1 = false;
-var b2 = false;
-var b3 = false;
+auto b1 = false;
+auto b2 = false;
+auto b3 = false;
 
-var i = 3
+auto i = 3
 if (i == 2) {
   b1 = true;
 }
diff --git a/unittests/if_elseif_else.chai b/unittests/if_elseif_else.chai
index 26ed0d2..0f96df7 100644
--- a/unittests/if_elseif_else.chai
+++ b/unittests/if_elseif_else.chai
@@ -1,5 +1,5 @@
-var i = 3
-var b = false
+auto i = 3
+auto b = false
 if (i == 2) {
   assert_equal(false, true)
 }
diff --git a/unittests/index_operator.chai b/unittests/index_operator.chai
index e8af5cf..f807404 100644
--- a/unittests/index_operator.chai
+++ b/unittests/index_operator.chai
@@ -3,7 +3,7 @@
 
 def Bob::bob3() { return [1,2,3]; }
 def Bob::Bob() {}
-var b = Bob();
+auto b = Bob();
 
 
 assert_equal(b.bob3()[0], 1);
diff --git a/unittests/inheritance.chai b/unittests/inheritance.chai
index 1fcd346..d5c4905 100644
--- a/unittests/inheritance.chai
+++ b/unittests/inheritance.chai
@@ -1,7 +1,7 @@
 load_module("test_module")
 
-var t0 = TestBaseType()
-var t = TestDerivedType();
+auto t0 = TestBaseType()
+auto t = TestDerivedType();
 
 assert_equal(t0.func(), 0);
 assert_equal(t.func(), 1);
diff --git a/unittests/instring_eval.chai b/unittests/instring_eval.chai
index a72b2fc..32eb2b9 100644
--- a/unittests/instring_eval.chai
+++ b/unittests/instring_eval.chai
@@ -1,3 +1,3 @@
-var bob = 5.5
+auto bob = 5.5
 assert_equal("5.5", "${bob}")
 assert_equal("val: 8 and 8", "val: ${5.5 + 2.5} and ${bob + 2.5}")
diff --git a/unittests/invalid_function_reassignment.chai b/unittests/invalid_function_reassignment.chai
index cc7cb5a..784372a 100644
--- a/unittests/invalid_function_reassignment.chai
+++ b/unittests/invalid_function_reassignment.chai
@@ -1 +1 @@
-assert_throws("Invalid function reassignment", fun() { var x = 5; x = `-`; } );
+assert_throws("Invalid function reassignment", fun() { auto x = 5; x = `-`; } );
diff --git a/unittests/is_undef.chai b/unittests/is_undef.chai
index 38572f0..894bd3f 100644
--- a/unittests/is_undef.chai
+++ b/unittests/is_undef.chai
@@ -1,4 +1,4 @@
-var i;
+auto i;
 assert_equal(true, i.is_var_undef());
 i = 5;
 assert_equal(false, i.is_var_undef());
diff --git a/unittests/lambda.chai b/unittests/lambda.chai
index 6b65a1b..9b717ec 100644
--- a/unittests/lambda.chai
+++ b/unittests/lambda.chai
@@ -1,2 +1,2 @@
-var bob = fun(x) { x + 1 }
+auto bob = fun(x) { x + 1 }
 assert_equal(4, bob(3));
diff --git a/unittests/list_push_back.chai b/unittests/list_push_back.chai
index 4d88deb..19d17e1 100644
--- a/unittests/list_push_back.chai
+++ b/unittests/list_push_back.chai
@@ -1,6 +1,6 @@
 load_module("stl_extra")
 
-var x = List()
+auto x = List()
 x.push_back(3)
 x.push_back("A")
 
diff --git a/unittests/list_push_front.chai b/unittests/list_push_front.chai
index 86e2832..fe31821 100644
--- a/unittests/list_push_front.chai
+++ b/unittests/list_push_front.chai
@@ -1,6 +1,6 @@
 load_module("stl_extra")
 
-var x = List()
+auto x = List()
 x.push_front(3)
 x.push_front("A")
 
diff --git a/unittests/loop_inner_outer.chai b/unittests/loop_inner_outer.chai
index 64a25e6..bda275f 100644
--- a/unittests/loop_inner_outer.chai
+++ b/unittests/loop_inner_outer.chai
@@ -1,7 +1,7 @@
-var total = 0
+auto total = 0
 
-for (var i = 0; i < 10; ++i) {
-  for (var j = 0; j < 10; ++j) {
+for (auto i = 0; i < 10; ++i) {
+  for (auto j = 0; j < 10; ++j) {
     total += 1
   }
 }
diff --git a/unittests/map_access.chai b/unittests/map_access.chai
index 19ebc1a..d544036 100644
--- a/unittests/map_access.chai
+++ b/unittests/map_access.chai
@@ -1,2 +1,2 @@
-var x = ["bob":2, "fred":3]
+auto x = ["bob":2, "fred":3]
 assert_equal(3, x["fred"])
diff --git a/unittests/map_inplace_init.chai b/unittests/map_inplace_init.chai
index b1d8221..1d88494 100644
--- a/unittests/map_inplace_init.chai
+++ b/unittests/map_inplace_init.chai
@@ -1,3 +1,3 @@
-var x = ["bob":1, "fred":2]
+auto x = ["bob":1, "fred":2]
 
 assert_equal(2, x.size());
diff --git a/unittests/math_dec.chai b/unittests/math_dec.chai
index e746f29..58a24e2 100644
--- a/unittests/math_dec.chai
+++ b/unittests/math_dec.chai
@@ -1,3 +1,3 @@
-var i = 3
+auto i = 3
 assert_equal(2, --i)
 assert_equal(2, i)
diff --git a/unittests/math_inc.chai b/unittests/math_inc.chai
index ec317c0..a5953a5 100644
--- a/unittests/math_inc.chai
+++ b/unittests/math_inc.chai
@@ -1,3 +1,3 @@
-var i = 3
+auto i = 3
 assert_equal(4, ++i)
 assert_equal(4, i)
diff --git a/unittests/memberscope.chai b/unittests/memberscope.chai
index fe46810..f1cf7c1 100644
--- a/unittests/memberscope.chai
+++ b/unittests/memberscope.chai
@@ -8,5 +8,5 @@ def Vector3::Vector3(x, y, z) {
     this.z = z
 }
 
-var v = Vector3(1,2,3);
+auto v = Vector3(1,2,3);
 assert_equal(1, v.x);
diff --git a/unittests/multiline.chai b/unittests/multiline.chai
index f13be4e..dfa213c 100644
--- a/unittests/multiline.chai
+++ b/unittests/multiline.chai
@@ -1,9 +1,9 @@
-var x = [1, 2,
+auto x = [1, 2,
  3, 4]
 
 assert_equal(1, x[0])
 
-var y = map(x, 
+auto y = map(x, 
  fun(x) { x + 1 })
 
 assert_equal(2, y[0])
diff --git a/unittests/object_attr.chai b/unittests/object_attr.chai
index c2da08e..7076345 100644
--- a/unittests/object_attr.chai
+++ b/unittests/object_attr.chai
@@ -1,6 +1,6 @@
 attr bob::z
 def bob::bob() { this.z = 10 }
-var x = bob()
+auto x = bob()
 def bob::fred(x) { this.z - x }
 
 assert_equal(7, x.fred(3))
diff --git a/unittests/object_clone.chai b/unittests/object_clone.chai
index 4659f41..d1673e8 100644
--- a/unittests/object_clone.chai
+++ b/unittests/object_clone.chai
@@ -1,10 +1,10 @@
 attr bob::z
 def bob::bob() { }
 
-var x = bob();
+auto x = bob();
 x.z = 10;
 
-var y = clone(x);
+auto y = clone(x);
 y.z = 20;
 
 assert_equal(10, x.z)
diff --git a/unittests/object_constructor_guards.chai b/unittests/object_constructor_guards.chai
index f48c00a..d574eaa 100644
--- a/unittests/object_constructor_guards.chai
+++ b/unittests/object_constructor_guards.chai
@@ -3,8 +3,8 @@ attr bob::val
 def bob::bob(x) : x < 10 { this.val = "Less Than Ten: " + x.to_string(); }
 def bob::bob(x) { this.val = "Any Other Value: " + x.to_string(); }
 
-var b = bob(12)
-var c = bob(3)
+auto b = bob(12)
+auto c = bob(3)
 
 assert_equal("Any Other Value: 12", b.val )
 assert_equal("Less Than Ten: 3", c.val )
diff --git a/unittests/object_lifetime_test.cpp b/unittests/object_lifetime_test.cpp
index 8d700fd..07f0c13 100644
--- a/unittests/object_lifetime_test.cpp
+++ b/unittests/object_lifetime_test.cpp
@@ -42,15 +42,15 @@ int main()
 
   int count = chai.eval<int>("count()");
 
-  int count2 = chai.eval<int>("var i = 0; { var t = Test(); } return i;");
+  int count2 = chai.eval<int>("auto i = 0; { auto t = Test(); } return i;");
 
-  int count3 = chai.eval<int>("var i = 0; { var t = Test(); i = count(); } return i;");
+  int count3 = chai.eval<int>("auto i = 0; { auto t = Test(); i = count(); } return i;");
 
-  int count4 = chai.eval<int>("var i = 0; { var t = Test(); { var t2 = Test(); i = count(); } } return i;");
+  int count4 = chai.eval<int>("auto i = 0; { auto t = Test(); { auto t2 = Test(); i = count(); } } return i;");
  
-  int count5 = chai.eval<int>("var i = 0; { var t = Test(); { var t2 = Test(); } i = count(); } return i;");
+  int count5 = chai.eval<int>("auto i = 0; { auto t = Test(); { auto t2 = Test(); } i = count(); } return i;");
 
-  int count6 = chai.eval<int>("var i = 0; { var t = Test(); { var t2 = Test(); }  } i = count(); return i;");
+  int count6 = chai.eval<int>("auto i = 0; { auto t = Test(); { auto t2 = Test(); }  } i = count(); return i;");
 
   if (count == 0
       && count2 == 0
diff --git a/unittests/object_method_guards.chai b/unittests/object_method_guards.chai
index addc850..5199c04 100644
--- a/unittests/object_method_guards.chai
+++ b/unittests/object_method_guards.chai
@@ -2,6 +2,6 @@ def bob::bob() { }
 def bob::fred(e) : e < 10 { assert_equal(true, e<10) }
 def bob::fred(e) { assert_equal(true, e >= 10) }
 
-var b = bob()
+auto b = bob()
 b.fred(3)
 b.fred(12)
diff --git a/unittests/operator_overload.chai b/unittests/operator_overload.chai
index 9bd2eb7..387209b 100644
--- a/unittests/operator_overload.chai
+++ b/unittests/operator_overload.chai
@@ -1,8 +1,8 @@
 def Bob::`+`(y) { this.x + y.x }
 def Bob::Bob() { }
 attr Bob::x
-var b = Bob()
-var c = Bob()
+auto b = Bob()
+auto c = Bob()
 b.x = 4
 c.x = 5
 
diff --git a/unittests/operator_overload2.chai b/unittests/operator_overload2.chai
index b4afbe7..a992dc7 100644
--- a/unittests/operator_overload2.chai
+++ b/unittests/operator_overload2.chai
@@ -1,8 +1,8 @@
 def Bob::Bob() { }
 attr Bob::x
 def `-`(a, b) : is_type(a, "Bob") && is_type(b, "Bob") { a.x - b.x }
-var b = Bob()
-var c = Bob()
+auto b = Bob()
+auto c = Bob()
 b.x = 4
 c.x = 5
 
diff --git a/unittests/operators_float.chai b/unittests/operators_float.chai
index 9a61d90..3f69378 100644
--- a/unittests/operators_float.chai
+++ b/unittests/operators_float.chai
@@ -1,6 +1,6 @@
-var i = 1.0;
-var j = 2.0;
-var k = 3.0;
+auto i = 1.0;
+auto j = 2.0;
+auto k = 3.0;
 
 assert_equal(3, i + j)
 assert_equal(1.0, +i)
diff --git a/unittests/operators_int.chai b/unittests/operators_int.chai
index 4627b55..395ce27 100644
--- a/unittests/operators_int.chai
+++ b/unittests/operators_int.chai
@@ -1,6 +1,6 @@
-var i = 1;
-var j = 2;
-var k = 3;
+auto i = 1;
+auto j = 2;
+auto k = 3;
 
 assert_equal(3, i + j);
 assert_equal(1, +i);
diff --git a/unittests/pair.chai b/unittests/pair.chai
index 9b3c804..2e30f66 100644
--- a/unittests/pair.chai
+++ b/unittests/pair.chai
@@ -1,4 +1,4 @@
-var p = Pair("Hello", "World")
+auto p = Pair("Hello", "World")
 
 assert_equal(p.first, "Hello")
 assert_equal(p.second, "World")
diff --git a/unittests/pointer_passed_to_constructor.chai b/unittests/pointer_passed_to_constructor.chai
index 6495ee3..988a238 100644
--- a/unittests/pointer_passed_to_constructor.chai
+++ b/unittests/pointer_passed_to_constructor.chai
@@ -1,8 +1,8 @@
 load_module("test_module")
 
-var i = 1;
-var t0 = TestBaseType(i);
+auto i = 1;
+auto t0 = TestBaseType(i);
 
-var t1 = TestBaseType(get_new_int())
+auto t1 = TestBaseType(get_new_int())
 
 
diff --git a/unittests/precedence_eq.chai b/unittests/precedence_eq.chai
index 325d667..39f2944 100644
--- a/unittests/precedence_eq.chai
+++ b/unittests/precedence_eq.chai
@@ -1,3 +1,3 @@
-var x = var y = 4
+auto x = auto y = 4
 assert_equal(4, x);
 assert_equal(4, y);
diff --git a/unittests/range.chai b/unittests/range.chai
index ddef4f2..97a430b 100644
--- a/unittests/range.chai
+++ b/unittests/range.chai
@@ -1,4 +1,4 @@
-var x = [1, 2, 3, 4]
-var r = range(x)
+auto x = [1, 2, 3, 4]
+auto r = range(x)
 r.pop_front()
 assert_equal(2, r.front());
diff --git a/unittests/range_back.chai b/unittests/range_back.chai
index 6bf5672..b572f94 100644
--- a/unittests/range_back.chai
+++ b/unittests/range_back.chai
@@ -1,4 +1,4 @@
-var x = [1, 2, 3, 4]
-var r = range(x)
+auto x = [1, 2, 3, 4]
+auto r = range(x)
 r.pop_back()
 assert_equal(3, r.back())
diff --git a/unittests/range_contains.chai b/unittests/range_contains.chai
index 28a99b1..e79051e 100644
--- a/unittests/range_contains.chai
+++ b/unittests/range_contains.chai
@@ -1,4 +1,4 @@
-var v = [1,2,"hi", "world", 5.5]
+auto v = [1,2,"hi", "world", 5.5]
 assert_equal(true, v.contains(5.5))
 assert_equal(false, v.contains(0))
 assert_equal(false, v.contains(1, lt))
diff --git a/unittests/range_find.chai b/unittests/range_find.chai
index 08045e5..1bdb1ba 100644
--- a/unittests/range_find.chai
+++ b/unittests/range_find.chai
@@ -1,6 +1,6 @@
-var v = [2, 1, "Hi", 5.5]
-var r = v.find("Hi");
+auto v = [2, 1, "Hi", 5.5]
+auto r = v.find("Hi");
 
 assert_equal("Hi", r.front())
-var r2 = v.find(2, `<`);
+auto r2 = v.find(2, `<`);
 assert_equal(1, r2.front());
diff --git a/unittests/ref_equal.chai b/unittests/ref_equal.chai
index 1dbb90e..200991e 100644
--- a/unittests/ref_equal.chai
+++ b/unittests/ref_equal.chai
@@ -1,5 +1,5 @@
-var i = 3
-var j := i
+auto i = 3
+auto j := i
 j = 4
 
 assert_equal(4, i)
diff --git a/unittests/reflection_test.chai b/unittests/reflection_test.chai
index 88b39cc..a35649e 100644
--- a/unittests/reflection_test.chai
+++ b/unittests/reflection_test.chai
@@ -1,14 +1,14 @@
 load_module("reflection")
-var parser := ChaiScript_Parser()
-var parse_success = parser.parse("3 + 4", "INPUT")
-var a := parser.ast()
+auto parser := ChaiScript_Parser()
+auto parse_success = parser.parse("3 + 4", "INPUT")
+auto a := parser.ast()
 
 assert_equal(eval(a), 7)
 
-var childs := a.children.front().children
-var node := childs[0]
+auto childs := a.children.front().children
+auto node := childs[0]
 
-var parser2 := ChaiScript_Parser()
+auto parser2 := ChaiScript_Parser()
 parser2.parse("9", "INPUT")
 
 
@@ -30,7 +30,7 @@ assert_equal(false, `+`.has_parse_tree());
 
 assert_throws("Function does not have a parse tree", fun() { `+`.get_parse_tree(); } );
 
-var parsetree := my_fun.get_parse_tree();
+auto parsetree := my_fun.get_parse_tree();
 
 assert_equal(1, eval(parsetree));
 
diff --git a/unittests/retro.chai b/unittests/retro.chai
index d7f6818..780a06d 100644
--- a/unittests/retro.chai
+++ b/unittests/retro.chai
@@ -1,4 +1,4 @@
-var x = [1, 2, 3, 4]
-var r = retro(range(x))
+auto x = [1, 2, 3, 4]
+auto r = retro(range(x))
 r.pop_front()
 assert_equal(3, r.front())
diff --git a/unittests/retroretro.chai b/unittests/retroretro.chai
index 09af3ca..36c568c 100644
--- a/unittests/retroretro.chai
+++ b/unittests/retroretro.chai
@@ -1,7 +1,7 @@
-var x = [1, 2, 3, 4]
-var r = retro(range(x))
+auto x = [1, 2, 3, 4]
+auto r = retro(range(x))
 r.pop_back()
-var r2 = retro(r)
+auto r2 = retro(r)
 r2.pop_front()
 assert_equal(2, r.back())
 assert_equal(3, r2.front())
diff --git a/unittests/runtime_error.chai b/unittests/runtime_error.chai
index e1e2fc1..b20c2c8 100644
--- a/unittests/runtime_error.chai
+++ b/unittests/runtime_error.chai
@@ -1,4 +1,4 @@
-var caught = false
+auto caught = false
 
 try {
   throw(runtime_error("error"))
diff --git a/unittests/utility_test.cpp b/unittests/utility_test.cpp
index 40ee4df..9dbb52a 100644
--- a/unittests/utility_test.cpp
+++ b/unittests/utility_test.cpp
@@ -35,9 +35,9 @@ int main()
 
   chaiscript::ChaiScript chai;
   chai.add(m);
-  if (chai.eval<std::string>("var t = Test(); t.function2(); ") == "Function2"
-      && chai.eval<std::string>("var t = Test(); t.functionOverload(1); ") == "int"
-      && chai.eval<std::string>("var t = Test(); t.functionOverload(1.1); ") == "double")
+  if (chai.eval<std::string>("auto t = Test(); t.function2(); ") == "Function2"
+      && chai.eval<std::string>("auto t = Test(); t.functionOverload(1); ") == "int"
+      && chai.eval<std::string>("auto t = Test(); t.functionOverload(1.1); ") == "double")
   {
     chai.eval("t = Test();");
     return EXIT_SUCCESS;
diff --git a/unittests/vector_access.chai b/unittests/vector_access.chai
index 34d483c..58269a2 100644
--- a/unittests/vector_access.chai
+++ b/unittests/vector_access.chai
@@ -1,2 +1,2 @@
-var x = [1, 2, 3]
+auto x = [1, 2, 3]
 assert_equal(3, x[2])
diff --git a/unittests/vector_erase_at.chai b/unittests/vector_erase_at.chai
index 9a96218..348cd81 100644
--- a/unittests/vector_erase_at.chai
+++ b/unittests/vector_erase_at.chai
@@ -1,3 +1,3 @@
-var x = [1, 2, 3]
+auto x = [1, 2, 3]
 x.erase_at(1)
 assert_equal([1,3], x);
diff --git a/unittests/vector_inplace_init.chai b/unittests/vector_inplace_init.chai
index f16c15b..7b01cb9 100644
--- a/unittests/vector_inplace_init.chai
+++ b/unittests/vector_inplace_init.chai
@@ -1,2 +1,2 @@
-var x = [1, 2, 3]
+auto x = [1, 2, 3]
 assert_equal(3, x.size())
diff --git a/unittests/vector_insert_at.chai b/unittests/vector_insert_at.chai
index 4f6ec45..1b42e1c 100644
--- a/unittests/vector_insert_at.chai
+++ b/unittests/vector_insert_at.chai
@@ -1,3 +1,3 @@
-var x = [1, 2, 3]
+auto x = [1, 2, 3]
 x.insert_at(1, 6)
 assert_equal([1,6,2,3], x);
diff --git a/unittests/vector_of_one.chai b/unittests/vector_of_one.chai
index f4bb01b..2763fc1 100644
--- a/unittests/vector_of_one.chai
+++ b/unittests/vector_of_one.chai
@@ -1,2 +1,2 @@
-var x = [1]
+auto x = [1]
 assert_equal(1, x[0])
diff --git a/unittests/vector_push_back.chai b/unittests/vector_push_back.chai
index 715082b..82ba4b4 100644
--- a/unittests/vector_push_back.chai
+++ b/unittests/vector_push_back.chai
@@ -1,4 +1,4 @@
-var x = [1, 2]
+auto x = [1, 2]
 x.push_back(3)
 assert_equal(3, x.size())
 assert_equal(3, x.back())
diff --git a/unittests/vector_push_empty.chai b/unittests/vector_push_empty.chai
index 29c568d..4cb7afe 100644
--- a/unittests/vector_push_empty.chai
+++ b/unittests/vector_push_empty.chai
@@ -1,4 +1,4 @@
-var bob = []
+auto bob = []
 bob.push_back(3)
 assert_equal(1, bob.size())
 assert_equal(3, bob.front())
diff --git a/unittests/zip.chai b/unittests/zip.chai
index d39583f..6aa5b36 100644
--- a/unittests/zip.chai
+++ b/unittests/zip.chai
@@ -1,4 +1,4 @@
-var z = zip([1, 2, 3], [4, 5, 6])
+auto z = zip([1, 2, 3], [4, 5, 6])
 
 assert_equal([1,4], z[0])
 assert_equal([2,5], z[1])
diff --git a/unittests/zip_with.chai b/unittests/zip_with.chai
index 1fe3dd9..ca2665a 100644
--- a/unittests/zip_with.chai
+++ b/unittests/zip_with.chai
@@ -1,3 +1,3 @@
-var z = zip_with(`+`, [1, 2, 3], [4, 5, 6])
+auto z = zip_with(`+`, [1, 2, 3], [4, 5, 6])
 
 assert_equal([5,7,9], z)