diff --git a/cpp/clock/CMakeLists.txt b/cpp/clock/CMakeLists.txt
new file mode 100644
index 0000000..56a3675
--- /dev/null
+++ b/cpp/clock/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Get the exercise name from the current directory
+get_filename_component(exercise ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+# Basic CMake project
+cmake_minimum_required(VERSION 2.8.11)
+
+# Name the project after the exercise
+project(${exercise} CXX)
+
+# Locate Boost libraries: unit_test_framework, date_time and regex
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+
+# Enable C++11 features on gcc/clang
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
+    set(CMAKE_CXX_FLAGS "-std=c++11")
+endif()
+
+# Configure to run all the tests?
+if(${EXERCISM_RUN_ALL_TESTS})
+    add_definitions(-DEXERCISM_RUN_ALL_TESTS)
+endif()
+
+# Get a source filename from the exercise name by replacing -'s with _'s
+string(REPLACE "-" "_" file ${exercise})
+
+# Implementation could be only a header
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.cpp)
+    set(exercise_cpp ${file}.cpp)
+else()
+    set(exercise_cpp "")
+endif()
+
+# Include a test helper header if it exists
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
+    set(test_helper require_equal_containers.h)
+else()
+    set(test_helper "")
+endif()
+
+# Build executable from sources and headers
+add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+
+# We need boost includes
+target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})
+
+# We need boost libraries
+target_link_libraries(${exercise} ${Boost_LIBRARIES})
+
+# Tell MSVC not to warn us about unchecked iterators in debug builds
+if(${MSVC})
+    set_target_properties(${exercise} PROPERTIES
+        COMPILE_DEFINITIONS_DEBUG _SCL_SECURE_NO_WARNINGS)
+endif()
+
+# Run the tests on every build
+add_custom_command(TARGET ${exercise} POST_BUILD COMMAND ${exercise})
diff --git a/cpp/clock/README.md b/cpp/clock/README.md
new file mode 100644
index 0000000..109a7f8
--- /dev/null
+++ b/cpp/clock/README.md
@@ -0,0 +1,45 @@
+# Clock
+
+Implement a clock that handles times without dates.
+
+Create a clock that is independent of date.
+
+You should be able to add and subtract minutes to it.
+
+Two clocks that represent the same time should be equal to each other.
+
+## Getting Started
+
+Make sure you have read the [getting started with C++](http://help.exercism.io/getting-started-with-cpp.html)
+page on the [exercism help site](http://help.exercism.io/).  This covers
+the basic information on setting up the development environment expected
+by the exercises.
+
+## Passing the Tests
+
+Get the first test compiling, linking and passing by following the [three
+rules of test-driven development](http://butunclebob.com/ArticleS.UncleBob.TheThreeRulesOfTdd).
+Create just enough structure by declaring namespaces, functions, classes,
+etc., to satisfy any compiler errors and get the test to fail.  Then write
+just enough code to get the test to pass.  Once you've done that,
+uncomment the next test by moving the following line past the next test.
+
+```C++
+#if defined(EXERCISM_RUN_ALL_TESTS)
+```
+
+This may result in compile errors as new constructs may be invoked that
+you haven't yet declared or defined.  Again, fix the compile errors minimally
+to get a failing test, then change the code minimally to pass the test,
+refactor your implementation for readability and expressiveness and then
+go on to the next test.
+
+Try to use standard C++11 facilities in preference to writing your own
+low-level algorithms or facilities by hand.  [CppReference](http://en.cppreference.com/)
+is a wiki reference to the C++ language and standard library.  If you
+are new to C++, but have programmed in C, beware of
+[C traps and pitfalls](http://www.slideshare.net/LegalizeAdulthood/c-traps-and-pitfalls-for-c-programmers).
+
+## Source
+
+Pairing session with Erin Drummond [view source](https://twitter.com/ebdrummond)
diff --git a/cpp/clock/clock_test.cpp b/cpp/clock/clock_test.cpp
new file mode 100644
index 0000000..1a39b81
--- /dev/null
+++ b/cpp/clock/clock_test.cpp
@@ -0,0 +1,84 @@
+#include "clock.h"
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+
+BOOST_AUTO_TEST_CASE(prints_the_hour)
+{
+    BOOST_REQUIRE_EQUAL("08:00", string(date_independent::clock::at(8)));
+    BOOST_REQUIRE_EQUAL("09:00", string(date_independent::clock::at(9)));
+}
+
+#if defined(EXERCISM_RUN_ALL_TESTS)
+BOOST_AUTO_TEST_CASE(prints_past_the_hour)
+{
+    BOOST_REQUIRE_EQUAL("11:09", string(date_independent::clock::at(11, 9)));
+    BOOST_REQUIRE_EQUAL("11:19", string(date_independent::clock::at(11, 19)));
+}
+
+BOOST_AUTO_TEST_CASE(can_add_minutes)
+{
+    const auto clock = date_independent::clock::at(10).plus(3);
+
+    BOOST_REQUIRE_EQUAL("10:03", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(can_add_over_an_hour)
+{
+    const auto clock = date_independent::clock::at(10).plus(61);
+
+    BOOST_REQUIRE_EQUAL("11:01", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(wraps_around_midnight)
+{
+    const auto clock = date_independent::clock::at(23, 59).plus(2);
+
+    BOOST_REQUIRE_EQUAL("00:01", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(can_subtract_minutes)
+{
+    const auto clock = date_independent::clock::at(10, 3).minus(3);
+
+    BOOST_REQUIRE_EQUAL("10:00", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(can_subtract_to_previous_hour)
+{
+    const auto clock = date_independent::clock::at(10, 3).minus(30);
+
+    BOOST_REQUIRE_EQUAL("09:33", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(can_subtract_over_an_hour)
+{
+    const auto clock = date_independent::clock::at(10, 3).minus(70);
+
+    BOOST_REQUIRE_EQUAL("08:53", string(clock));
+}
+
+BOOST_AUTO_TEST_CASE(can_know_if_its_equal_to_another_clock)
+{
+    const auto clock1 = date_independent::clock::at(10, 3);
+    const auto clock2 = date_independent::clock::at(10, 3);
+
+    BOOST_REQUIRE(clock1 == clock2);
+}
+
+BOOST_AUTO_TEST_CASE(can_know_if_its_not_equal_to_another_clock)
+{
+    const auto clock1 = date_independent::clock::at(10, 3);
+    const auto clock2 = date_independent::clock::at(10, 4);
+
+    BOOST_REQUIRE(clock1 != clock2);
+}
+
+BOOST_AUTO_TEST_CASE(wraps_around_midnight_backwards)
+{
+    const auto clock = date_independent::clock::at(0, 3).minus(4);
+
+    BOOST_REQUIRE_EQUAL("23:59", string(clock));
+}
+#endif