diff --git a/include/boost/fusion/adapted/class.hpp b/include/boost/fusion/adapted/class.hpp
new file mode 100644
index 00000000..be973831
--- /dev/null
+++ b/include/boost/fusion/adapted/class.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_CLASS_OCTOBER_4_2009_839PM)
+#define BOOST_FUSION_CLASS_OCTOBER_4_2009_839PM
+
+#include <boost/fusion/adapted/class/extension.hpp>
+#include <boost/fusion/adapted/class/adapt_struct.hpp>
+#include <boost/fusion/adapted/class/adapt_assoc_struct.hpp>
+#include <boost/fusion/adapted/class/class_iterator.hpp>
+
+#include <boost/fusion/adapted/class/detail/at_impl.hpp>
+#include <boost/fusion/adapted/class/detail/at_key_impl.hpp>
+#include <boost/fusion/adapted/class/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/class/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/class/detail/end_impl.hpp>
+#include <boost/fusion/adapted/class/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/class/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/class/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/class/detail/size_impl.hpp>
+#include <boost/fusion/adapted/class/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/class/detail/value_at_key_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/adapted/class/adapt_assoc_class.hpp b/include/boost/fusion/adapted/class/adapt_assoc_class.hpp
new file mode 100644
index 00000000..11f40ade
--- /dev/null
+++ b/include/boost/fusion/adapted/class/adapt_assoc_class.hpp
@@ -0,0 +1,94 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2007 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_ADAPT_ASSOC_CLASS_OCTOBER_4_2009_840PM)
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_OCTOBER_4_2009_840PM
+
+#include <boost/fusion/support/tag_of_fwd.hpp>
+#include <boost/fusion/adapted/class/extension.hpp>
+#include <boost/fusion/adapted/class/class_iterator.hpp>
+#include <boost/fusion/adapted/class/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/class/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/class/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/class/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/class/detail/end_impl.hpp>
+#include <boost/fusion/adapted/class/detail/size_impl.hpp>
+#include <boost/fusion/adapted/class/detail/at_impl.hpp>
+#include <boost/fusion/adapted/class/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/class/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/class/detail/at_key_impl.hpp>
+#include <boost/fusion/adapted/class/detail/value_at_key_impl.hpp>
+
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/seq/for_each_i.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
+#include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/config/no_tr1/utility.hpp>
+
+namespace boost { namespace fusion { namespace extension {
+    template<typename Class, typename Key>
+    struct class_assoc_member;
+}}}
+
+
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS(name, bseq)                             \
+    BOOST_FUSION_ADAPT_ASSOC_CLASS_I(                                           \
+        name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_ASSOC_CLASS_X bseq, 0))           \
+    /***/
+
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_X(x, y, z) ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_CLASS_Y
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_Y(x, y, z) ((x, y, z)) BOOST_FUSION_ADAPT_ASSOC_CLASS_X
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_X0
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_Y0
+
+// BOOST_FUSION_ADAPT_ASSOC_CLASS_I generates the overarching structure and uses
+// SEQ_FOR_EACH_I to generate the "linear" substructures.
+// Thanks to Paul Mensonides for the PP macro help
+
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_I(name, seq)                             \
+    namespace boost { namespace fusion { namespace traits                       \
+    {                                                                           \
+        template <>                                                             \
+        struct tag_of<name>                                                     \
+        {                                                                       \
+            typedef class_tag type;                                             \
+        };                                                                      \
+    }}}                                                                         \
+    namespace boost { namespace fusion { namespace extension                    \
+    {                                                                           \
+        template <>                                                             \
+        struct class_size<name> : mpl::int_<BOOST_PP_SEQ_SIZE(seq)> {};         \
+        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_ASSOC_CLASS_C, name, seq)    \
+    }}}                                                                         \
+    /***/
+
+#define BOOST_FUSION_ADAPT_ASSOC_CLASS_C(r, name, i, xy)                        \
+    template <>                                                                 \
+    struct class_member<name, i>                                                \
+    {                                                                           \
+        typedef BOOST_PP_TUPLE_ELEM(3, 0, xy) type;                             \
+        static type& call(name& class_)                                         \
+        {                                                                       \
+            return class_.BOOST_PP_TUPLE_ELEM(3, 1, xy);                        \
+        };                                                                      \
+    };                                                                          \
+    template<>                                                                  \
+    struct class_assoc_member<name, BOOST_PP_TUPLE_ELEM(3, 2, xy)>              \
+    {                                                                           \
+        typedef BOOST_PP_TUPLE_ELEM(3, 0, xy) type;                             \
+        static type& call(name& class_)                                         \
+        {                                                                       \
+            return class_.BOOST_PP_TUPLE_ELEM(3, 1, xy);                        \
+        };                                                                      \
+    };
+    /***/
+
+#endif
diff --git a/include/boost/fusion/adapted/class/adapt_class.hpp b/include/boost/fusion/adapted/class/adapt_class.hpp
new file mode 100644
index 00000000..c4e5c29f
--- /dev/null
+++ b/include/boost/fusion/adapted/class/adapt_class.hpp
@@ -0,0 +1,104 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_ADAPT_CLASS_OCTOBER_4_2009_840PM)
+#define BOOST_FUSION_ADAPT_CLASS_OCTOBER_4_2009_840PM
+
+#include <boost/fusion/support/tag_of_fwd.hpp>
+#include <boost/fusion/adapted/class/extension.hpp>
+#include <boost/fusion/adapted/class/class_iterator.hpp>
+#include <boost/fusion/adapted/class/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/class/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/class/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/class/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/class/detail/end_impl.hpp>
+#include <boost/fusion/adapted/class/detail/size_impl.hpp>
+#include <boost/fusion/adapted/class/detail/at_impl.hpp>
+#include <boost/fusion/adapted/class/detail/value_at_impl.hpp>
+
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/seq/for_each_i.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
+#include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/config/no_tr1/utility.hpp>
+
+#define BOOST_FUSION_ADAPT_CLASS(name, bseq)                                    \
+    BOOST_FUSION_ADAPT_CLASS_I(                                                 \
+        name, BOOST_PP_CAT(BOOST_FUSION_ADAPT_CLASS_X bseq, 0))                 \
+    /***/
+
+#define BOOST_FUSION_ADAPT_CLASS_X(w, x, y, z) ((w, x, y, z)) BOOST_FUSION_ADAPT_CLASS_Y
+#define BOOST_FUSION_ADAPT_CLASS_Y(w, x, y, z) ((w, x, y, z)) BOOST_FUSION_ADAPT_CLASS_X
+#define BOOST_FUSION_ADAPT_CLASS_X0
+#define BOOST_FUSION_ADAPT_CLASS_Y0
+
+// BOOST_FUSION_ADAPT_CLASS_I generates the overarching structure and uses
+// SEQ_FOR_EACH_I to generate the "linear" substructures.
+// Thanks to Paul Mensonides for the PP macro help
+
+#define BOOST_FUSION_ADAPT_CLASS_I(name, seq)                                   \
+    namespace boost { namespace fusion { namespace traits                       \
+    {                                                                           \
+        template <>                                                             \
+        struct tag_of<name>                                                     \
+        {                                                                       \
+            typedef class_tag type;                                             \
+        };                                                                      \
+    }}}                                                                         \
+    namespace boost { namespace fusion { namespace extension                    \
+    {                                                                           \
+        template <>                                                             \
+        struct class_size<name> : mpl::int_<BOOST_PP_SEQ_SIZE(seq)> {};         \
+        BOOST_PP_SEQ_FOR_EACH_I(BOOST_FUSION_ADAPT_CLASS_C, name, seq)          \
+    }}}                                                                         \
+    /***/
+
+#define BOOST_FUSION_ADAPT_CLASS_C(r, name, i, xy)                              \
+    template <>                                                                 \
+    struct class_member<name, i>                                                \
+    {                                                                           \
+        typedef BOOST_PP_TUPLE_ELEM(4, 0, xy) type;                             \
+        typedef BOOST_PP_TUPLE_ELEM(4, 1, xy) get_type;                         \
+        struct proxy                                                            \
+        {                                                                       \
+            typedef BOOST_PP_TUPLE_ELEM(4, 0, xy) type;                         \
+            typedef BOOST_PP_TUPLE_ELEM(4, 1, xy) get_type;                     \
+            typedef                                                             \
+                add_reference<add_const<type>::type>::type                      \
+            cref_type;                                                          \
+                                                                                \
+            proxy(name& obj) : obj(obj) {}                                      \
+            name& obj;                                                          \
+                                                                                \
+            proxy& operator=(cref_type val)                                     \
+            {                                                                   \
+                BOOST_PP_TUPLE_ELEM(4, 3, xy);                                  \
+                return *this;                                                   \
+            }                                                                   \
+                                                                                \
+            operator get_type()                                                 \
+            {                                                                   \
+                return BOOST_PP_TUPLE_ELEM(4, 2, xy);                           \
+            }                                                                   \
+        };                                                                      \
+                                                                                \
+        static get_type call(name const& obj)                                   \
+        {                                                                       \
+            return BOOST_PP_TUPLE_ELEM(4, 2, xy);                               \
+        };                                                                      \
+                                                                                \
+        static proxy call(name& obj)                                            \
+        {                                                                       \
+            return proxy(obj);                                                  \
+        };                                                                      \
+    };                                                                          \
+    /***/
+
+#endif
diff --git a/include/boost/fusion/adapted/class/class_iterator.hpp b/include/boost/fusion/adapted/class/class_iterator.hpp
new file mode 100644
index 00000000..639ee927
--- /dev/null
+++ b/include/boost/fusion/adapted/class/class_iterator.hpp
@@ -0,0 +1,105 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(FUSION_CLASS_ITERATOR_OCTOBER_4_2009_839M)
+#define FUSION_CLASS_ITERATOR_OCTOBER_4_2009_839M
+
+#include <boost/fusion/iterator/iterator_facade.hpp>
+#include <boost/fusion/adapted/class/extension.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/add_reference.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/mpl/minus.hpp>
+#include <boost/config/no_tr1/utility.hpp>
+
+namespace boost { namespace fusion
+{
+    struct random_access_traversal_tag;
+
+    template <typename Class, int N_>
+    struct class_iterator
+        : iterator_facade<class_iterator<Class, N_>, random_access_traversal_tag>
+    {
+        BOOST_MPL_ASSERT_RELATION(N_, >=, 0);
+        BOOST_MPL_ASSERT_RELATION(N_, <=, extension::class_size<Class>::value);
+
+        typedef mpl::int_<N_> index;
+        typedef Class class_type;
+
+        class_iterator(Class& class_)
+            : class_(class_) {}
+        Class& class_;
+
+        template <typename Iterator>
+        struct value_of
+            : extension::class_member<Class, N_>
+        {
+        };
+
+        template <typename Iterator>
+        struct deref
+        {
+            typedef typename
+                mpl::if_<
+                    is_const<Class>
+                  , typename extension::class_member<Class, N_>::get_type
+                  , typename extension::class_member<Class, N_>::proxy
+                >::type
+            type;
+
+            static type
+            call(Iterator const& iter)
+            {
+                return extension::class_member<Class, N_>::
+                    call(iter.class_);
+            }
+        };
+
+        template <typename Iterator, typename N>
+        struct advance
+        {
+            typedef typename Iterator::index index;
+            typedef typename Iterator::class_type class_type;
+            typedef class_iterator<class_type, index::value + N::value> type;
+
+            static type
+            call(Iterator const& iter)
+            {
+                return type(iter.class_);
+            }
+        };
+
+        template <typename Iterator>
+        struct next : advance<Iterator, mpl::int_<1> > {};
+
+        template <typename Iterator>
+        struct prior : advance<Iterator, mpl::int_<-1> > {};
+
+        template <typename I1, typename I2>
+        struct distance : mpl::minus<typename I2::index, typename I1::index>
+        {
+            typedef typename
+                mpl::minus<
+                    typename I2::index, typename I1::index
+                >::type
+            type;
+
+            static type
+            call(I1 const&, I2 const&)
+            {
+                return type();
+            }
+        };
+    };
+}}
+
+#endif
+
+
diff --git a/include/boost/fusion/adapted/class/detail/at_impl.hpp b/include/boost/fusion/adapted/class/detail/at_impl.hpp
new file mode 100644
index 00000000..12b5171f
--- /dev/null
+++ b/include/boost/fusion/adapted/class/detail/at_impl.hpp
@@ -0,0 +1,70 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_AT_IMPL_OCTOBER_4_2009_920PM)
+#define BOOST_FUSION_AT_IMPL_OCTOBER_4_2009_920PM
+
+#include <boost/fusion/support/detail/access.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/int.hpp>
+
+namespace boost { namespace fusion
+{
+    struct class_tag;
+
+    namespace extension
+    {
+        template<typename T>
+        struct at_impl;
+
+        template <typename Class, int N>
+        struct class_member;
+
+        template <typename Class>
+        struct class_size;
+
+        template <>
+        struct at_impl<class_tag>
+        {
+            template <typename Sequence, typename N>
+            struct apply
+            {
+                static int const n_value = N::value;
+                BOOST_MPL_ASSERT_RELATION(
+                    n_value, <=, extension::class_size<Sequence>::value);
+
+                typedef typename
+                    extension::class_member<Sequence, N::value>
+                element;
+
+                typedef typename
+                    mpl::if_<
+                        is_const<Sequence>
+                      , typename class_member<Sequence, N::value>::get_type
+                      , typename class_member<Sequence, N::value>::proxy
+                    >::type
+                type;
+
+                static type
+                call(Sequence& seq)
+                {
+                    return extension::
+                        class_member<Sequence, N::value>::call(seq);
+                }
+                
+                //~ static typename class_member<Sequence, N::value>::get_type
+                //~ call(Sequence const& seq)
+                //~ {
+                    //~ return extension::
+                        //~ class_member<Sequence, N::value>::call(seq);
+                //~ }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/adapted/class/detail/at_key_impl.hpp b/include/boost/fusion/adapted/class/detail/at_key_impl.hpp
new file mode 100644
index 00000000..9df985bf
--- /dev/null
+++ b/include/boost/fusion/adapted/class/detail/at_key_impl.hpp
@@ -0,0 +1,54 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2005-2007 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_AT_KEY_IMPL_OCTOBER_4_2009_920PM)
+#define BOOST_FUSION_AT_KEY_IMPL_OCTOBER_4_2009_920PM
+
+#include <boost/fusion/support/detail/access.hpp>
+
+namespace boost { namespace fusion
+{
+    struct class_tag;
+
+    namespace extension
+    {
+        template<typename T>
+        struct at_key_impl;
+
+        template <typename Class, typename Key>
+        struct class_assoc_member;
+
+        template <>
+        struct at_key_impl<class_tag>
+        {
+            template <typename Sequence, typename Key>
+            struct apply
+            {
+                typedef typename
+                extension::class_assoc_member<Sequence, Key>
+                element;
+
+                typedef typename
+                    mpl::eval_if<
+                        is_const<Sequence>
+                      , detail::cref_result<element>
+                      , detail::ref_result<element>
+                    >::type
+                type;
+
+                static type
+                call(Sequence& seq)
+                {
+                    return extension::
+                        class_assoc_member<Sequence, Key>::call(seq);
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/adapted/class/detail/begin_impl.hpp b/include/boost/fusion/adapted/class/detail/begin_impl.hpp
new file mode 100644
index 00000000..4fadac4e
--- /dev/null
+++ b/include/boost/fusion/adapted/class/detail/begin_impl.hpp
@@ -0,0 +1,40 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_BEGIN_IMPL_OCTOBER_4_2009_920PM)
+#define BOOST_FUSION_BEGIN_IMPL_OCTOBER_4_2009_920PM
+
+#include <boost/fusion/adapted/class/class_iterator.hpp>
+
+namespace boost { namespace fusion
+{
+    struct class_tag;
+
+    namespace extension
+    {
+        template<typename T>
+        struct begin_impl;
+
+        template <>
+        struct begin_impl<class_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef class_iterator<Sequence, 0> type;
+
+                static type
+                call(Sequence& v)
+                {
+                    return type(v);
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/adapted/class/detail/category_of_impl.hpp b/include/boost/fusion/adapted/class/detail/category_of_impl.hpp
new file mode 100644
index 00000000..821cf38b
--- /dev/null
+++ b/include/boost/fusion/adapted/class/detail/category_of_impl.hpp
@@ -0,0 +1,35 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_OCTOBER_4_2009_919PM)
+#define BOOST_FUSION_CATEGORY_OF_IMPL_OCTOBER_4_2009_919PM
+
+#include <boost/config/no_tr1/utility.hpp>
+
+namespace boost { namespace fusion
+{
+    struct class_tag;
+    struct random_access_traversal_tag;
+
+    namespace extension
+    {
+        template<typename T>
+        struct category_of_impl;
+
+        template<>
+        struct category_of_impl<class_tag>
+        {
+            template<typename T>
+            struct apply
+            {
+                typedef random_access_traversal_tag type;
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/container/vector/detail/vector_n.hpp b/include/boost/fusion/container/vector/detail/vector_n.hpp
index 01981ab3..2d9ac128 100644
--- a/include/boost/fusion/container/vector/detail/vector_n.hpp
+++ b/include/boost/fusion/container/vector/detail/vector_n.hpp
@@ -9,7 +9,7 @@
 #if !defined(FUSION_MACRO_05042005)
 #define FUSION_MACRO_05042005
 
-#define FUSION_MEMBER_DEFAULT_INIT(z, n, _)     m##n(T##n())
+#define FUSION_MEMBER_DEFAULT_INIT(z, n, _)     m##n()
 #define FUSION_MEMBER_INIT(z, n, _)             m##n(_##n)
 #define FUSION_COPY_INIT(z, n, _)               m##n(other.m##n)
 #define FUSION_MEMBER_DECL(z, n, _)             T##n m##n;
diff --git a/include/boost/fusion/view/nview/detail/nview_impl.hpp b/include/boost/fusion/view/nview/detail/nview_impl.hpp
index c0179597..03aa49f4 100644
--- a/include/boost/fusion/view/nview/detail/nview_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/nview_impl.hpp
@@ -23,24 +23,22 @@
     "boost/fusion/view/nview/detail/nview_impl.hpp"))                         \
     /**/
 
-#include BOOST_PP_ITERATE()
-
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace fusion { namespace result_of
 {
     template <typename Sequence
-      , BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(FUSION_MAX_VECTOR_SIZE, int I, INT_MAX)>
+      , BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(FUSION_MAX_VECTOR_SIZE, int I, LONG_MAX)>
     struct as_nview
     {
         typedef mpl::vector_c<
             int, BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, I)
         > index_type;
-
         typedef nview<Sequence, index_type> type;
     };
-
 }}}
 
+#include BOOST_PP_ITERATE()
+
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -50,6 +48,18 @@ namespace boost { namespace fusion { namespace result_of
 
 #define N BOOST_PP_ITERATION()
 
+#if N < FUSION_MAX_VECTOR_SIZE
+namespace boost { namespace fusion { namespace result_of
+{
+    template <typename Sequence, BOOST_PP_ENUM_PARAMS(N, int I)>
+    struct as_nview<Sequence, BOOST_PP_ENUM_PARAMS(N, I)>
+    {
+        typedef mpl::vector_c<int, BOOST_PP_ENUM_PARAMS(N, I)> index_type;
+        typedef nview<Sequence, index_type> type;
+    };
+}}}
+#endif
+
 namespace boost { namespace fusion
 {
     template<BOOST_PP_ENUM_PARAMS(N, int I), typename Sequence>
diff --git a/include/boost/fusion/view/nview/detail/size_impl.hpp b/include/boost/fusion/view/nview/detail/size_impl.hpp
new file mode 100644
index 00000000..0c834026
--- /dev/null
+++ b/include/boost/fusion/view/nview/detail/size_impl.hpp
@@ -0,0 +1,38 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(FUSION_NVIEW_SIZE_IMPL_OCT_06_2009_0525PM)
+#define FUSION_NVIEW_SIZE_IMPL_OCT_06_2009_0525PM
+
+#include <boost/fusion/iterator/distance.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+
+namespace boost { namespace fusion
+{
+    struct nview_tag;
+
+    namespace extension
+    {
+        template <typename Tag>
+        struct size_impl;
+
+        template <>
+        struct size_impl<nview_tag>
+        {
+            template <typename Sequence>
+            struct apply
+                : result_of::distance<
+                    typename result_of::begin<Sequence>::type
+                  , typename result_of::end<Sequence>::type>
+            {};
+        };
+    }
+}}
+
+#endif
+
+
diff --git a/include/boost/fusion/view/nview/nview_iterator.hpp b/include/boost/fusion/view/nview/nview_iterator.hpp
index 12580749..60895093 100644
--- a/include/boost/fusion/view/nview/nview_iterator.hpp
+++ b/include/boost/fusion/view/nview/nview_iterator.hpp
@@ -13,6 +13,7 @@
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
+#include <boost/fusion/view/nview/detail/size_impl.hpp>
 #include <boost/fusion/view/nview/detail/begin_impl.hpp>
 #include <boost/fusion/view/nview/detail/end_impl.hpp>
 #include <boost/fusion/view/nview/detail/deref_impl.hpp>