diff --git a/applications/solvers/CMakeLists.txt b/applications/solvers/CMakeLists.txt
index eec85dfe2..e65124b0b 100644
--- a/applications/solvers/CMakeLists.txt
+++ b/applications/solvers/CMakeLists.txt
@@ -50,3 +50,5 @@ add_subdirectory(basic)
 add_subdirectory(immersedBoundary)
 add_subdirectory(surfaceTracking)
 add_subdirectory(viscoelastic)
+add_subdirectory(overset)
+
diff --git a/applications/solvers/combustion/XiFoam/CMakeLists.txt b/applications/solvers/combustion/XiFoam/CMakeLists.txt
index 7a8786c89..196b70758 100644
--- a/applications/solvers/combustion/XiFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/XiFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(XiFoam
-  DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
+  DEPENDS engine compressibleRASModels compressibleLESModels laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
index f7bfd34a2..8d625e81f 100644
--- a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(coldEngineFoam
-  DEPENDS engine compressibleTurbulenceModel
+  DEPENDS engine compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/combustion/engineFoam/CMakeLists.txt b/applications/solvers/combustion/engineFoam/CMakeLists.txt
index c41002435..47164b062 100644
--- a/applications/solvers/combustion/engineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/engineFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(engineFoam
-  DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
+  DEPENDS engine compressibleRASModels compressibleLESModels laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/combustion/fireFoam/CMakeLists.txt b/applications/solvers/combustion/fireFoam/CMakeLists.txt
index c3902fde1..ee05c2edb 100644
--- a/applications/solvers/combustion/fireFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/CMakeLists.txt
@@ -43,6 +43,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(fireFoam
-  DEPENDS compressibleTurbulenceModel radiation combustionModels
+  DEPENDS radiation combustionModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/reactingFoam/CMakeLists.txt b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
index 8497390a3..ec1fd3eb6 100644
--- a/applications/solvers/combustion/reactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(reactingFoam
-  DEPENDS compressibleTurbulenceModel chemistryModel
+  DEPENDS compressibleRASModels compressibleLESModels chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
index f62fdb133..5506664d5 100644
--- a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoReactingFoam
-  DEPENDS chemistryModel compressibleTurbulenceModel
+  DEPENDS chemistryModel compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
index 39215ebb8..b00a8e3a6 100644
--- a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(realFluidPisoFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
index 40bfaf524..20138f4cd 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
@@ -37,6 +37,6 @@ list(APPEND SOURCES
   rho/fixedRhoFvPatchScalarField.C
 )
 
-add_foam_library(rhoCentralFoam SHARED ${SOURCES})
+add_foam_library(rhoCentralFoamLib SHARED ${SOURCES})
 
-target_link_libraries(rhoCentralFoam finiteVolume)
+target_link_libraries(rhoCentralFoamLib PUBLIC finiteVolume)
diff --git a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
index 18725c311..f064dabe1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
@@ -30,4 +30,19 @@
 #
 # --------------------------------------------------------------------------
 
-add_subdirectory(BCs)
\ No newline at end of file
+add_subdirectory(BCs)
+
+list(APPEND SOURCES
+  rhoCentralFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(rhoCentralFoam
+  DEPENDS rhoCentralFoamLib compressibleRASModels compressibleLESModels
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
index cf8c4ab9c..58fbd28ea 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPimpleFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
index 7441bb2d7..e8d852551 100644
--- a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPisoFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
index afade899b..365c9114f 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPorousMRFPimpleFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
index dbaf8e29b..aefd58392 100644
--- a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
@@ -39,6 +39,6 @@ list(APPEND SOURCES
   p/inviscidWallPFvPatchScalarField.C
 )
 
-add_foam_library(rhopSonicFoam SHARED ${SOURCES})
+add_foam_library(rhopSonicFoamLib SHARED ${SOURCES})
 
-target_link_libraries(rhopSonicFoam PUBLIC finiteVolume)
+target_link_libraries(rhopSonicFoamLib PUBLIC finiteVolume)
diff --git a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
index 18725c311..fafdee937 100644
--- a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
@@ -30,4 +30,19 @@
 #
 # --------------------------------------------------------------------------
 
-add_subdirectory(BCs)
\ No newline at end of file
+add_subdirectory(BCs)
+
+list(APPEND SOURCES
+  rhopSonicFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(rhopSonicFoam
+  DEPENDS rhopSonicFoamLib compressibleRASModels compressibleLESModels
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
index 189772b7b..afac95c80 100644
--- a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicDyMFoam
-  DEPENDS compressibleTurbulenceModel dynamicFvMesh
+  DEPENDS dynamicFvMesh compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/sonicFoam/CMakeLists.txt b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
index 7938c1d97..fcd4bf8d6 100644
--- a/applications/solvers/compressible/sonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
index 1ff6a36ec..f2056cd89 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicTurbDyMEngineFoam
-  DEPENDS compressibleTurbulenceModel engine
+  DEPENDS engine compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
index 5ea3057d3..5a2660c95 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantPisoFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
index 9f99eb816..3092abbe4 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
@@ -46,7 +46,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(chtMultiRegionFoam
-  DEPENDS compressibleTurbulenceModel
+  DEPENDS compressibleRASModels compressibleLESModels
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
index 3ffdd4b8a..f2ef809b1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
@@ -32,4 +32,23 @@
 
 add_subdirectory(interfacialModels)
 add_subdirectory(phaseModel)
-add_subdirectory(kineticTheoryModels)
\ No newline at end of file
+add_subdirectory(kineticTheoryModels)
+
+list(APPEND SOURCES
+  twoPhaseEulerFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(twoPhaseEulerFoam
+  DEPENDS kineticTheoryModel
+  SOURCES ${SOURCES}
+)
+
+target_include_directories(twoPhaseEulerFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/turbulenceModel>
+)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
index 78a1e0420..6eb6d77d7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
@@ -44,4 +44,4 @@ list(APPEND SOURCES
 
 add_foam_library(EulerianInterfacialModels SHARED ${SOURCES})
 
-target_link_libraries(EulerianInterfacialModels PUBLIC phaseModel)
+target_link_libraries(EulerianInterfacialModels PUBLIC finiteVolume phaseModel)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
index 3dbb8709b..c50818015 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
@@ -61,7 +61,7 @@ list(APPEND SOURCES
 
 add_foam_library(kineticTheoryModel SHARED ${SOURCES})
 
-target_link_libraries(kineticTheoryModel PUBLIC phaseModel)
+target_link_libraries(kineticTheoryModel PUBLIC EulerianInterfacialModels)
 
 target_include_directories(kineticTheoryModel PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels/dragModels/dragModel>
diff --git a/applications/solvers/overset/CMakeLists.txt b/applications/solvers/overset/CMakeLists.txt
new file mode 100644
index 000000000..2b3434aea
--- /dev/null
+++ b/applications/solvers/overset/CMakeLists.txt
@@ -0,0 +1,42 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+add_subdirectory(icoDyMOversetFoam)
+add_subdirectory(icoOversetFoam)
+add_subdirectory(interOversetFoam)
+add_subdirectory(laplacianOversetFoam)
+add_subdirectory(pimpleDyMOversetFoam)
+add_subdirectory(potentialDyMOversetFoam)
+add_subdirectory(potentialOversetFoam)
+add_subdirectory(scalarTransportOversetFoam)
+add_subdirectory(simpleMRFOversetFoam)
+add_subdirectory(simpleOversetFoam)
diff --git a/applications/solvers/overset/icoDyMOversetFoam/CMakeLists.txt b/applications/solvers/overset/icoDyMOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..dcd7ab8dc
--- /dev/null
+++ b/applications/solvers/overset/icoDyMOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  icoDyMOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(icoDyMOversetFoam
+  DEPENDS oversetDynamicFvMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/icoOversetFoam/CMakeLists.txt b/applications/solvers/overset/icoOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..9958a9829
--- /dev/null
+++ b/applications/solvers/overset/icoOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  icoOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(icoOversetFoam
+  DEPENDS oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/interOversetFoam/CMakeLists.txt b/applications/solvers/overset/interOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..0d3b10e7d
--- /dev/null
+++ b/applications/solvers/overset/interOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  interOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(interOversetFoam
+  DEPENDS interfaceProperties incompressibleRASModels incompressibleLESModels oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/laplacianOversetFoam/CMakeLists.txt b/applications/solvers/overset/laplacianOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..e41649b81
--- /dev/null
+++ b/applications/solvers/overset/laplacianOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  laplacianOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(laplacianOversetFoam
+  DEPENDS oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/pimpleDyMOversetFoam/CMakeLists.txt b/applications/solvers/overset/pimpleDyMOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..d5d90f611
--- /dev/null
+++ b/applications/solvers/overset/pimpleDyMOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  pimpleDyMOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(pimpleDyMOversetFoam
+  DEPENDS incompressibleRASModels incompressibleLESModels oversetDynamicFvMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/potentialDyMOversetFoam/CMakeLists.txt b/applications/solvers/overset/potentialDyMOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..1ec94eec8
--- /dev/null
+++ b/applications/solvers/overset/potentialDyMOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  potentialDyMOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(potentialDyMOversetFoam
+  DEPENDS oversetDynamicFvMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/potentialOversetFoam/CMakeLists.txt b/applications/solvers/overset/potentialOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..f42b7f0e8
--- /dev/null
+++ b/applications/solvers/overset/potentialOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  potentialOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(potentialOversetFoam
+  DEPENDS oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/scalarTransportOversetFoam/CMakeLists.txt b/applications/solvers/overset/scalarTransportOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..8a0d57c50
--- /dev/null
+++ b/applications/solvers/overset/scalarTransportOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  scalarTransportOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(scalarTransportOversetFoam
+  DEPENDS oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/simpleMRFOversetFoam/CMakeLists.txt b/applications/solvers/overset/simpleMRFOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..45474c935
--- /dev/null
+++ b/applications/solvers/overset/simpleMRFOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  simpleMRFOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(simpleMRFOversetFoam
+  DEPENDS incompressibleRASModels oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/solvers/overset/simpleOversetFoam/CMakeLists.txt b/applications/solvers/overset/simpleOversetFoam/CMakeLists.txt
new file mode 100644
index 000000000..2ae906a62
--- /dev/null
+++ b/applications/solvers/overset/simpleOversetFoam/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  simpleOversetFoam.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(simpleOversetFoam
+  DEPENDS incompressibleRASModels oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/utilities/CMakeLists.txt b/applications/utilities/CMakeLists.txt
index e6d2eda88..bbda2e4b5 100644
--- a/applications/utilities/CMakeLists.txt
+++ b/applications/utilities/CMakeLists.txt
@@ -40,4 +40,5 @@ add_subdirectory(finiteArea)
 add_subdirectory(postProcessing)
 add_subdirectory(parallelProcessing)
 add_subdirectory(errorEstimation)
-add_subdirectory(mesh)
\ No newline at end of file
+add_subdirectory(mesh)
+add_subdirectory(overset)
diff --git a/applications/utilities/overset/CMakeLists.txt b/applications/utilities/overset/CMakeLists.txt
new file mode 100644
index 000000000..df8d70e51
--- /dev/null
+++ b/applications/utilities/overset/CMakeLists.txt
@@ -0,0 +1,34 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+add_subdirectory(calcOverset)
+add_subdirectory(oversetRegionIndex)
diff --git a/applications/utilities/overset/calcOverset/CMakeLists.txt b/applications/utilities/overset/calcOverset/CMakeLists.txt
new file mode 100644
index 000000000..50d48c413
--- /dev/null
+++ b/applications/utilities/overset/calcOverset/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  calcOverset.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(calcOverset
+  DEPENDS oversetMesh
+  SOURCES ${SOURCES}
+)
diff --git a/applications/utilities/overset/oversetRegionIndex/CMakeLists.txt b/applications/utilities/overset/oversetRegionIndex/CMakeLists.txt
new file mode 100644
index 000000000..21ad98500
--- /dev/null
+++ b/applications/utilities/overset/oversetRegionIndex/CMakeLists.txt
@@ -0,0 +1,46 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend 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.
+#
+#     foam-extend 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 foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
+list(APPEND SOURCES
+  oversetRegionIndex.C
+)
+
+# Set minimal environment for external compilation
+if(NOT FOAM_FOUND)
+  cmake_minimum_required(VERSION 2.8)
+  find_package(FOAM REQUIRED)
+endif()
+
+add_foam_executable(oversetRegionIndex
+  DEPENDS finiteVolume
+  SOURCES ${SOURCES}
+)
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 4ddba2b6d..d82dd0d89 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -128,17 +128,21 @@ compileApplication ()
             wmake $1
         fi
         rm -rf $lockFilename
+        echo DONE
     fi
 }
 
 compileLibrary ()
 {
     echo "Compiling $1 library"
+    echo $WM_USE_CMAKE
     if [ "$WM_USE_CMAKE" = "1" ];
-        (cd $1; cmake .; make)
     then
+        (cd $1; cmake .; make)
+    else
         wmake libso $1
     fi
+    echo DONE
 }
 
 cloneCase ()
diff --git a/cmake/FOAMMacros.cmake b/cmake/FOAMMacros.cmake
index 98c9c012d..3c4f73899 100644
--- a/cmake/FOAMMacros.cmake
+++ b/cmake/FOAMMacros.cmake
@@ -36,6 +36,11 @@ add_custom_target(ImportMessage
 )
 
 function(add_foam_library lib)
+  set(options USERSPACE)
+  set(oneValueArgs "")
+  set(multiValueArgs "")
+  cmake_parse_arguments(AFL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
   # Create target for lnInclude and use it
   include_directories(lnInclude)
   add_custom_command(
@@ -47,8 +52,13 @@ function(add_foam_library lib)
   )
   add_custom_target(${lib}_lnInclude DEPENDS lnInclude/uptodate)
 
+  if(${AFL_USERSPACE})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY $ENV{FOAM_USER_LIBBIN})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $ENV{FOAM_USER_APPBIN})
+  endif()
+
   # Add the library to the targets and set include paths
-  add_library(${lib} ${ARGN})
+  add_library(${lib} ${AFL_UNPARSED_ARGUMENTS})
   add_dependencies(${lib} ${lib}_lnInclude)
   target_include_directories(${lib} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lnInclude>
@@ -88,12 +98,14 @@ function(add_foam_executable exe)
   cmake_parse_arguments(AFE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
   if(${AFE_USERSPACE})
-    message(STATUS Got here)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY $ENV{FOAM_USER_LIBBIN})
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $ENV{FOAM_USER_APPBIN})
   endif()
 
   add_executable(${exe} ${AFE_SOURCES})
+  target_link_libraries(${exe}
+    "-Xlinker --add-needed -Xlinker --no-as-needed"
+  )
   target_link_libraries(${exe} ${AFE_DEPENDS})
   install (TARGETS ${exe} DESTINATION bin)
 
diff --git a/cmake/compileFOAM.cmake b/cmake/compileFOAM.cmake
index 65e810ee9..4088e047e 100644
--- a/cmake/compileFOAM.cmake
+++ b/cmake/compileFOAM.cmake
@@ -93,14 +93,14 @@ endif()
 
 find_package(Metis REQUIRED)
 if(METIS_FOUND)
-  add_library(metis SHARED IMPORTED)
+  add_library(metis STATIC IMPORTED)
   set_property(TARGET metis PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${METIS_INCLUDE_DIRS})
   set_property(TARGET metis PROPERTY IMPORTED_LOCATION ${METIS_LIBRARY})
 endif()
 
 find_package(ParMetis REQUIRED)
 if(PARMETIS_FOUND)
-  add_library(parmetis SHARED IMPORTED)
+  add_library(parmetis STATIC IMPORTED)
   set_property(TARGET parmetis PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PARMETIS_INCLUDE_DIRS})
   set_property(TARGET parmetis PROPERTY IMPORTED_LOCATION ${PARMETIS_LIBRARY})
 endif()
@@ -121,10 +121,6 @@ if(CCMIO_FOUND)
   set_property(TARGET ccmio PROPERTY INTERFACE_LINK_LIBRARIES ${CCMIO_LIBRARIES})
 endif()
 
-#SET(CMAKE_INSTALL_RPATH FALSE)
-#SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 #
 # Recurse into the source
@@ -138,7 +134,6 @@ file(WRITE ${CMAKE_BINARY_DIR}/cmake/FOAMTargets.cmake "#" )
 
 add_subdirectory(src)
 add_subdirectory(applications)
-#add_subdirectory(tutorials)
 
 
 #
@@ -182,6 +177,11 @@ if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
   target_compile_options(OSspecific PUBLIC -fdefault-inline -ggdb3)
 endif()
 
+#target_link_libraries(
+#  OSspecific INTERFACE
+#  "-Xlinker --add-needed -Xlinker --no-as-needed"
+#)
+
 #target_compile_options(
 #  OSspecific PUBLIC
 #  -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
diff --git a/cmake/testFOAM.cmake b/cmake/testFOAM.cmake
index 3e85f8540..8aa681e76 100644
--- a/cmake/testFOAM.cmake
+++ b/cmake/testFOAM.cmake
@@ -324,7 +324,7 @@ message("Site name: ${SITE}")
 
 # Compile FOAM, libs and apps
 add_custom_target (foam-extend-$ENV{WM_PROJECT_VERSION} ALL
-  #${FOAM_ROOT}/Allwmake
+  ${FOAM_ROOT}/Allwmake
 )
 
 set_property(
diff --git a/src/postProcessing/postCalc/CMakeLists.txt b/src/postProcessing/postCalc/CMakeLists.txt
index 38ca43219..6d0018a9d 100644
--- a/src/postProcessing/postCalc/CMakeLists.txt
+++ b/src/postProcessing/postCalc/CMakeLists.txt
@@ -34,6 +34,6 @@ list(APPEND SOURCES
   postCalc.C
 )
 
-add_foam_library(postCalc SHARED ${SOURCES})
+add_foam_library(postCalc STATIC ${SOURCES})
 
 target_link_libraries(postCalc PUBLIC finiteVolume)
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
index e7c130aae..bab7f26aa 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
 
 libs
 (
-    "libcompressibleRASModels"
+    "libcompressibleRASModels.so"
     "liblduSolvers.so"
 )
 
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
index 027293cd5..f5280bd6e 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
 
 libs
 (
-    "libcompressibleRASModels.so"
+    //"libcompressibleRASModels.so"
     "liblduSolvers.so"
 )
 
diff --git a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict
index ddb2fb038..b6d94190b 100644
--- a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict
+++ b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/controlDict
@@ -58,6 +58,7 @@ libs
 (
     "libimmersedBoundary.so"
     "libimmersedBoundaryDynamicMesh.so"
+    "liblduSolvers.so"
 );
 
 functions
diff --git a/tutorials/immersedBoundary/movingCylinderInChannelIcoFine/system/controlDict b/tutorials/immersedBoundary/movingCylinderInChannelIcoFine/system/controlDict
index 5e31c46bd..4b0fb0186 100644
--- a/tutorials/immersedBoundary/movingCylinderInChannelIcoFine/system/controlDict
+++ b/tutorials/immersedBoundary/movingCylinderInChannelIcoFine/system/controlDict
@@ -58,6 +58,7 @@ libs
 (
     "libimmersedBoundary.so"
     "libimmersedBoundaryDynamicMesh.so"
+    "liblduSolvers.so"
 );
 
 functions
diff --git a/tutorials/immersedBoundary/pitzDailyTurbulent/system/controlDict b/tutorials/immersedBoundary/pitzDailyTurbulent/system/controlDict
index 793d3e1c4..2fc863beb 100644
--- a/tutorials/immersedBoundary/pitzDailyTurbulent/system/controlDict
+++ b/tutorials/immersedBoundary/pitzDailyTurbulent/system/controlDict
@@ -17,6 +17,7 @@ FoamFile
 libs
 (
     "libimmersedBoundary.so"
+    "liblduSolvers.so"
 )
 
 application     simpleFoam;
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
index 1716910f8..73553934d 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
@@ -40,6 +40,6 @@ if(NOT FOAM_FOUND)
   find_package(FOAM REQUIRED)
 endif()
 
-add_foam_library(RBFMotionFunction SHARED ${SOURCES})
+add_foam_library(RBFMotionFunction USERSPACE SHARED ${SOURCES})
 
 target_link_libraries(RBFMotionFunction PUBLIC RBFMotionSolver)
diff --git a/tutorials/overset/flowTests/channelSimpleOverlapicoOversetFoam/system/controlDict b/tutorials/overset/flowTests/channelSimpleOverlapicoOversetFoam/system/controlDict
index 424d5d5ff..240935225 100644
--- a/tutorials/overset/flowTests/channelSimpleOverlapicoOversetFoam/system/controlDict
+++ b/tutorials/overset/flowTests/channelSimpleOverlapicoOversetFoam/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/flowTests/cylinderInChannelicoOversetFoam/system/controlDict b/tutorials/overset/flowTests/cylinderInChannelicoOversetFoam/system/controlDict
index d220e9ced..6640203f8 100644
--- a/tutorials/overset/flowTests/cylinderInChannelicoOversetFoam/system/controlDict
+++ b/tutorials/overset/flowTests/cylinderInChannelicoOversetFoam/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/flowTests/oversetCylinderThreeLevels/system/controlDict b/tutorials/overset/flowTests/oversetCylinderThreeLevels/system/controlDict
index 95d22ee95..11ac56016 100644
--- a/tutorials/overset/flowTests/oversetCylinderThreeLevels/system/controlDict
+++ b/tutorials/overset/flowTests/oversetCylinderThreeLevels/system/controlDict
@@ -55,6 +55,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/flowTests/oversetCylinderThreeLevelssimpleOversetFoam/system/controlDict b/tutorials/overset/flowTests/oversetCylinderThreeLevelssimpleOversetFoam/system/controlDict
index fcf97a723..1d2037ebe 100644
--- a/tutorials/overset/flowTests/oversetCylinderThreeLevelssimpleOversetFoam/system/controlDict
+++ b/tutorials/overset/flowTests/oversetCylinderThreeLevelssimpleOversetFoam/system/controlDict
@@ -57,6 +57,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/flowTests/oversetCylinderTwoLevels/system/controlDict b/tutorials/overset/flowTests/oversetCylinderTwoLevels/system/controlDict
index 95d22ee95..11ac56016 100644
--- a/tutorials/overset/flowTests/oversetCylinderTwoLevels/system/controlDict
+++ b/tutorials/overset/flowTests/oversetCylinderTwoLevels/system/controlDict
@@ -55,6 +55,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/flowTests/staticCylinderSheddingTest/bodyFittedCylinder/system/controlDict b/tutorials/overset/flowTests/staticCylinderSheddingTest/bodyFittedCylinder/system/controlDict
index 2791c6d6e..3f32b1599 100644
--- a/tutorials/overset/flowTests/staticCylinderSheddingTest/bodyFittedCylinder/system/controlDict
+++ b/tutorials/overset/flowTests/staticCylinderSheddingTest/bodyFittedCylinder/system/controlDict
@@ -47,6 +47,12 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+libs
+(
+    "liblduSolvers.so"
+);
+
+
 functions
 (
     forces
diff --git a/tutorials/overset/flowTests/staticCylinderSheddingTest/oversetCylinder/system/controlDict b/tutorials/overset/flowTests/staticCylinderSheddingTest/oversetCylinder/system/controlDict
index b04aa170e..fdc953691 100644
--- a/tutorials/overset/flowTests/staticCylinderSheddingTest/oversetCylinder/system/controlDict
+++ b/tutorials/overset/flowTests/staticCylinderSheddingTest/oversetCylinder/system/controlDict
@@ -55,6 +55,8 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/freeSurfaceTests/cylBumpinterOversetFoam/system/controlDict b/tutorials/overset/freeSurfaceTests/cylBumpinterOversetFoam/system/controlDict
index 3504a7f3f..50c34c67c 100644
--- a/tutorials/overset/freeSurfaceTests/cylBumpinterOversetFoam/system/controlDict
+++ b/tutorials/overset/freeSurfaceTests/cylBumpinterOversetFoam/system/controlDict
@@ -50,5 +50,10 @@ adjustTimeStep  yes;
 
 maxCo           0.5;
 
+libs
+(
+    "liblduSolvers.so"
+);
+
 
 // ************************************************************************* //
diff --git a/tutorials/overset/movingMeshTests/movingCylinderInChannelicoDyMOversetFoam/system/controlDict b/tutorials/overset/movingMeshTests/movingCylinderInChannelicoDyMOversetFoam/system/controlDict
index ab14e4d63..f6bcd2367 100644
--- a/tutorials/overset/movingMeshTests/movingCylinderInChannelicoDyMOversetFoam/system/controlDict
+++ b/tutorials/overset/movingMeshTests/movingCylinderInChannelicoDyMOversetFoam/system/controlDict
@@ -55,6 +55,7 @@ libs
     "libdynamicFvMesh.so"
     "liboversetMesh.so"
     "liboversetDynamicFvMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/movingMeshTests/movingCylinderInChannelpimpleDyMOversetFoam/system/controlDict b/tutorials/overset/movingMeshTests/movingCylinderInChannelpimpleDyMOversetFoam/system/controlDict
index ed3a6b754..ace6574a1 100644
--- a/tutorials/overset/movingMeshTests/movingCylinderInChannelpimpleDyMOversetFoam/system/controlDict
+++ b/tutorials/overset/movingMeshTests/movingCylinderInChannelpimpleDyMOversetFoam/system/controlDict
@@ -58,6 +58,7 @@ libs
     "libdynamicFvMesh.so"
     "liboversetMesh.so"
     "liboversetDynamicFvMesh.so"
+    "liblduSolvers.so"
 );
 
 functions
diff --git a/tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/controlDict b/tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/controlDict
index 2c7ddd376..bf9609104 100644
--- a/tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/controlDict
+++ b/tutorials/overset/parallelTests/NACA4412-ThreeLayerOverlapFringeAssemby-100Processors/system/controlDict
@@ -44,6 +44,12 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+libs
+(
+    "liblduSolvers.so"
+);
+
+
 functions
 (
     forces
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapLaplace/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapLaplace/system/controlDict
index 411eefab7..2f685f321 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapLaplace/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapLaplace/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAcross/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAcross/system/controlDict
index 411eefab7..2f685f321 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAcross/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAcross/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAlong/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAlong/system/controlDict
index 411eefab7..2f685f321 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAlong/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutAlong/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutFringe/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutFringe/system/controlDict
index 411eefab7..2f685f321 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutFringe/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceCutFringe/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceNonInterfering/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceNonInterfering/system/controlDict
index 411eefab7..2f685f321 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceNonInterfering/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapLaplaceNonInterfering/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/channelSimpleOverlapPotentialScalarTransport/system/controlDict b/tutorials/overset/simpleTests/channelSimpleOverlapPotentialScalarTransport/system/controlDict
index a84a6e76b..97f341b35 100644
--- a/tutorials/overset/simpleTests/channelSimpleOverlapPotentialScalarTransport/system/controlDict
+++ b/tutorials/overset/simpleTests/channelSimpleOverlapPotentialScalarTransport/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/cylinderInChannelPotentialScalarTransport/system/controlDict b/tutorials/overset/simpleTests/cylinderInChannelPotentialScalarTransport/system/controlDict
index 89f5aa9bd..9e9ddc5cb 100644
--- a/tutorials/overset/simpleTests/cylinderInChannelPotentialScalarTransport/system/controlDict
+++ b/tutorials/overset/simpleTests/cylinderInChannelPotentialScalarTransport/system/controlDict
@@ -52,6 +52,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/cylinderInSquareLaplace/system/controlDict b/tutorials/overset/simpleTests/cylinderInSquareLaplace/system/controlDict
index 1644e94a9..67532332d 100644
--- a/tutorials/overset/simpleTests/cylinderInSquareLaplace/system/controlDict
+++ b/tutorials/overset/simpleTests/cylinderInSquareLaplace/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );
 
 
diff --git a/tutorials/overset/simpleTests/cylinderInSquareLaplaceAutoFringe/system/controlDict b/tutorials/overset/simpleTests/cylinderInSquareLaplaceAutoFringe/system/controlDict
index 1644e94a9..67532332d 100644
--- a/tutorials/overset/simpleTests/cylinderInSquareLaplaceAutoFringe/system/controlDict
+++ b/tutorials/overset/simpleTests/cylinderInSquareLaplaceAutoFringe/system/controlDict
@@ -53,6 +53,7 @@ libs
     "libsampling.so"
     "libdynamicMesh.so"
     "liboversetMesh.so"
+    "liblduSolvers.so"
 );