diff --git a/ArduinoJson.sln b/ArduinoJson.sln
index 8e3ed4ea..291b3445 100644
--- a/ArduinoJson.sln
+++ b/ArduinoJson.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArduinoJsonTests", "tests\tests.vcxproj", "{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArduinoJson", "srcs\srcs.vcxproj", "{8E8F5E24-3936-4375-8F0E-1A8054BCB049}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}.Debug|Win32.Build.0 = Debug|Win32
 		{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}.Release|Win32.ActiveCfg = Release|Win32
 		{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}.Release|Win32.Build.0 = Release|Win32
+		{8E8F5E24-3936-4375-8F0E-1A8054BCB049}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E8F5E24-3936-4375-8F0E-1A8054BCB049}.Debug|Win32.Build.0 = Debug|Win32
+		{8E8F5E24-3936-4375-8F0E-1A8054BCB049}.Release|Win32.ActiveCfg = Release|Win32
+		{8E8F5E24-3936-4375-8F0E-1A8054BCB049}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/srcs/StaticJsonBuffer.h b/srcs/StaticJsonBuffer.h
new file mode 100644
index 00000000..9103dcf6
--- /dev/null
+++ b/srcs/StaticJsonBuffer.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "JsonBuffer.h"
+
+template<int CAPACITY>
+class StaticJsonBuffer //: public JsonBuffer
+{
+public:
+    virtual ~StaticJsonBuffer() {}
+
+    int capacity()
+    {
+        return CAPACITY;
+    }
+
+    int size()
+    {
+        return _size;
+    }
+
+protected:
+    //virtual JsonNode& allocateNode();
+
+private:
+    //JsonNode _buffer[CAPACITY];
+    int _size;
+};
\ No newline at end of file
diff --git a/srcs/srcs.vcxproj b/srcs/srcs.vcxproj
new file mode 100644
index 00000000..220e0e89
--- /dev/null
+++ b/srcs/srcs.vcxproj
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8E8F5E24-3936-4375-8F0E-1A8054BCB049}</ProjectGuid>
+    <RootNamespace>srcs</RootNamespace>
+    <ProjectName>ArduinoJson</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="StaticJsonBuffer.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/srcs/srcs.vcxproj.filters b/srcs/srcs.vcxproj.filters
new file mode 100644
index 00000000..16cf8ca4
--- /dev/null
+++ b/srcs/srcs.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="StaticJsonBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/DummyTests.cpp b/tests/DummyTests.cpp
deleted file mode 100644
index 0bda8524..00000000
--- a/tests/DummyTests.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <gtest/gtest.h>
-
-TEST(DummyTests, EXPECT_TRUE)
-{
-    EXPECT_TRUE(true);
-}
\ No newline at end of file
diff --git a/tests/StaticJsonBufferTests.cpp b/tests/StaticJsonBufferTests.cpp
new file mode 100644
index 00000000..a2e62c4b
--- /dev/null
+++ b/tests/StaticJsonBufferTests.cpp
@@ -0,0 +1,8 @@
+#include <gtest/gtest.h>
+#include <StaticJsonBuffer.h>
+
+TEST(StaticJsonBufferTests, CapacityMatchTemplateParameter)
+{
+    StaticJsonBuffer<42> json;   
+    EXPECT_EQ(42, json.capacity());
+}
\ No newline at end of file
diff --git a/tests/tests.vcxproj b/tests/tests.vcxproj
index 54248dfc..eb242917 100644
--- a/tests/tests.vcxproj
+++ b/tests/tests.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{2AF8ACCD-9566-462D-9A36-5BA6B0A98F33}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>tests</RootNamespace>
-    <ProjectName>ArduinoJsonTest</ProjectName>
+    <ProjectName>ArduinoJsonTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -53,7 +53,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third-party\gtest-1.7.0;$(SolutionDir)\third-party\gtest-1.7.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\srcs;$(SolutionDir)\third-party\gtest-1.7.0;$(SolutionDir)\third-party\gtest-1.7.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -69,7 +69,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third-party\gtest-1.7.0;$(SolutionDir)\third-party\gtest-1.7.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\srcs;$(SolutionDir)\third-party\gtest-1.7.0;$(SolutionDir)\third-party\gtest-1.7.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -81,7 +81,12 @@
   <ItemGroup>
     <ClCompile Include="..\third-party\gtest-1.7.0\src\gtest-all.cc" />
     <ClCompile Include="..\third-party\gtest-1.7.0\src\gtest_main.cc" />
-    <ClCompile Include="DummyTests.cpp" />
+    <ClCompile Include="StaticJsonBufferTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\srcs\srcs.vcxproj">
+      <Project>{8e8f5e24-3936-4375-8f0e-1a8054bcb049}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tests/tests.vcxproj.filters b/tests/tests.vcxproj.filters
index 13d431e2..383683cb 100644
--- a/tests/tests.vcxproj.filters
+++ b/tests/tests.vcxproj.filters
@@ -24,7 +24,7 @@
     <ClCompile Include="..\third-party\gtest-1.7.0\src\gtest_main.cc">
       <Filter>Third Party Files</Filter>
     </ClCompile>
-    <ClCompile Include="DummyTests.cpp">
+    <ClCompile Include="StaticJsonBufferTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>