diff --git a/opm/parser/eclipse/CMakeLists.txt b/opm/parser/eclipse/CMakeLists.txt
index e917337fe..f9cd19c33 100644
--- a/opm/parser/eclipse/CMakeLists.txt
+++ b/opm/parser/eclipse/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(Parser/tests)
 add_subdirectory(RawDeck/tests)
 add_subdirectory(Deck/tests)
 add_subdirectory(IntegrationTests)
+add_subdirectory(EclipseState/Schedule/tests)
 
 add_subdirectory( Applications )
 
@@ -45,6 +46,8 @@ Parser/ParserDoubleItem.cpp
 Parser/ParserStringItem.cpp  
 )
 
+set (state_source
+EclipseState/Schedule/TimeMap.cpp )
 
 set( HEADER_FILES
 RawDeck/RawConsts.hpp 
@@ -71,6 +74,8 @@ Parser/ParserBoolItem.hpp
 Parser/ParserDoubleItem.hpp  
 Parser/ParserStringItem.hpp  
 Parser/ParserItemTemplate.hpp
+#
+EclipseState/Schedule/TimeMap.hpp
 )
 
 add_library(buildParser ${rawdeck_source} ${build_parser_source} ${deck_source})
@@ -88,7 +93,7 @@ add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/generated-source/DefaultKeyword
 
 #-----------------------------------------------------------------
 
-add_library(Parser ${rawdeck_source} ${parser_source} ${deck_source})
+add_library(Parser ${rawdeck_source} ${parser_source} ${deck_source} ${state_source})
 target_link_libraries(Parser opm-json ${Boost_LIBRARIES})
 
 
diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
new file mode 100644
index 000000000..38f8de049
--- /dev/null
+++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
@@ -0,0 +1,29 @@
+/*
+  Copyright 2013 Statoil ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
+
+
+namespace Opm {
+
+    TimeMap::TimeMap() {}
+
+}
+
+
diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp
new file mode 100644
index 000000000..859dca4ba
--- /dev/null
+++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp
@@ -0,0 +1,36 @@
+/*
+  Copyright 2013 Statoil ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef TIMEMAP_HPP_
+#define TIMEMAP_HPP_
+
+namespace Opm {
+
+    class TimeMap {
+    public:
+        TimeMap();
+
+    };
+
+}
+
+
+
+#endif /* TIMEMAP_HPP_ */
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
new file mode 100644
index 000000000..380a49a72
--- /dev/null
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(runTimeMapTests TimeMapTest.cpp)
+target_link_libraries(runTimeMapTests Parser ${Boost_LIBRARIES})
+add_test(NAME runTimeMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
new file mode 100644
index 000000000..fe7704892
--- /dev/null
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
@@ -0,0 +1,33 @@
+/*
+  Copyright 2013 Statoil ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdexcept>
+#include <iostream>
+#include <boost/filesystem.hpp>
+
+#define BOOST_TEST_MODULE ParserTests
+#include <boost/test/unit_test.hpp>
+
+#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
+
+
+
+BOOST_AUTO_TEST_CASE(CreateTimeMap) {
+    Opm::TimeMap timeMap;
+}