diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..99f1ef41
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "coloquinte2"]
+	path = coloquinte2
+	url = git@github.com:Coloquinte/PlaceRoute.git
diff --git a/bootstrap/Makefile.package b/bootstrap/Makefile.package
index c5dca5a5..5090eead 100644
--- a/bootstrap/Makefile.package
+++ b/bootstrap/Makefile.package
@@ -4,7 +4,7 @@
 
  pythonSiteLocator = "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1)"
 
-             tools = bootstrap vlsisapd hurricane crlcore coloquinte etesian knik \
+             tools = bootstrap vlsisapd hurricane crlcore coloquinte coloquinte2 etesian knik \
                      katabatic kite equinox solstice cumulus stratus1 unicorn documentation
             prefix = /usr
         rootPrefix = $(subst /usr,,$(prefix))
diff --git a/bootstrap/build.conf b/bootstrap/build.conf
index 6f3aa465..636b47db 100644
--- a/bootstrap/build.conf
+++ b/bootstrap/build.conf
@@ -15,6 +15,7 @@ projects = [
              , 'tools'     : [ "bootstrap"
                              , "lefdef"
                              , "coloquinte"
+                             , "coloquinte2"
                              , "hurricane"
                              , "crlcore"
                              , "flute"
diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake
index 0fb7e836..1f9c55db 100644
--- a/bootstrap/cmake_modules/FindBootstrap.cmake
+++ b/bootstrap/cmake_modules/FindBootstrap.cmake
@@ -84,10 +84,10 @@
  set(DEBUG_FLAGS "-g")
  if(CYGWIN)
    set(ADDITIONAL_FLAGS "-D_GLIBCXX_USE_C99")
-   set(CXX_STANDARD "gnu++11")
+   set(CXX_STANDARD "gnu++17")
  else()
    set(ADDITIONAL_FLAGS "-Wl,--no-undefined")
-   set(CXX_STANDARD "c++11")
+   set(CXX_STANDARD "c++17")
  endif()
 #set(CMAKE_C_FLAGS_DEBUG     "                     -Wall -fsanitize=address ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
  set(CMAKE_C_FLAGS_DEBUG     "                     -Wall                    ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in
index e541bb8b..2f1ef48b 100644
--- a/bootstrap/coriolis2.spec.in
+++ b/bootstrap/coriolis2.spec.in
@@ -157,6 +157,7 @@ Development files for the Coriolis 2 package.
 %dir %{coriolisTop}/include/vlsisapd/dtr
 %dir %{coriolisTop}/include/vlsisapd/openChams
 %dir %{coriolisTop}/include/coriolis2/coloquinte
+%dir %{coriolisTop}/include/coriolis2/coloquinte2
 %dir %{coriolisTop}/include/coriolis2/hurricane
 %dir %{coriolisTop}/include/coriolis2/hurricane/viewer
 %dir %{coriolisTop}/include/coriolis2/hurricane/isobar
diff --git a/builder.py b/builder.py
index 53f4b6b7..2ab2ba45 100644
--- a/builder.py
+++ b/builder.py
@@ -117,6 +117,7 @@ class ExtensionBuilder(build_ext):
 def build(setup_kwargs: Dict[str, Any]) -> None:
     cmake_modules = [
                      CMakeExtension("coloquinte", sourcedir="coloquinte"),
+                     CMakeExtension("coloquinte2", sourcedir="coloquinte2"),
                      CMakeExtension("Hurricane", sourcedir="hurricane"),
                      CMakeExtension("crlcore", sourcedir="crlcore"),
                      CMakeExtension("flute", sourcedir="flute"),
diff --git a/coloquinte2 b/coloquinte2
new file mode 160000
index 00000000..068689b3
--- /dev/null
+++ b/coloquinte2
@@ -0,0 +1 @@
+Subproject commit 068689b3eea8d2a5b47ada054fba828209897515