diff --git a/.gitmodules b/.gitmodules
index 3fc81ad0..0e10210c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "thirdparty/googletest"]
 	path = thirdparty/googletest
 	url = https://github.com/abseil/googletest.git
+[submodule "thirdparty/P0267_RefImpl"]
+	path = thirdparty/P0267_RefImpl
+	url = https://github.com/cpp-io2d/P0267_RefImpl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 461eac9f..b95c4cf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,6 @@ project(OSM_A_star_search)
 set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/lib")
 
 # Locate project prerequisites
-find_package(io2d REQUIRED)
 find_package(Cairo)
 find_package(GraphicsMagick)
 
@@ -21,6 +20,7 @@ set(IO2D_WITHOUT_SAMPLES 1)
 set(IO2D_WITHOUT_TESTS 1)
 
 # Add the pugixml and GoogleTest library subdirectories
+add_subdirectory(thirdparty/P0267_RefImpl)
 add_subdirectory(thirdparty/pugixml)
 add_subdirectory(thirdparty/googletest)
 
@@ -28,7 +28,7 @@ add_subdirectory(thirdparty/googletest)
 add_executable(OSM_A_star_search src/main.cpp src/model.cpp src/render.cpp src/route_model.cpp src/route_planner.cpp)
 
 target_link_libraries(OSM_A_star_search
-    PRIVATE io2d::io2d
+    PRIVATE io2d
     PUBLIC pugixml
 )
 
diff --git a/README.md b/README.md
index da3d4a28..fb29c689 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,6 @@ git clone git@github.com:udacity/CppND-Route-Planning-Project.git --recurse-subm
   * Linux: gcc / g++ is installed by default on most Linux distros
   * Mac: same instructions as make - [install Xcode command line tools](https://developer.apple.com/xcode/features/)
   * Windows: recommend using [MinGW](http://www.mingw.org/)
-* IO2D
-  * Installation instructions for all operating systems can be found [here](https://github.com/cpp-io2d/P0267_RefImpl/blob/master/BUILDING.md)
-  * This library must be built in a place where CMake `find_package` will be able to find it
- 
 
 ## Compiling and Running
 
diff --git a/thirdparty/P0267_RefImpl b/thirdparty/P0267_RefImpl
new file mode 160000
index 00000000..caa0ba0c
--- /dev/null
+++ b/thirdparty/P0267_RefImpl
@@ -0,0 +1 @@
+Subproject commit caa0ba0cb5a421a38bc26afaf3505bee206c44dd
diff --git a/thirdparty/googletest b/thirdparty/googletest
index 695cf7c9..e38ef3be 160000
--- a/thirdparty/googletest
+++ b/thirdparty/googletest
@@ -1 +1 @@
-Subproject commit 695cf7c96249de50360a7d2951dc88eb3aea0695
+Subproject commit e38ef3be887afc0089005e394c5001002e313960