diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt
index 377a5d0..216756d 100644
--- a/src/geometry/CMakeLists.txt
+++ b/src/geometry/CMakeLists.txt
@@ -23,5 +23,8 @@ list(APPEND geometry_LIB_INCLUDES
 # add the library
 add_library(geometry SHARED ${geometry_LIB_INCLUDES})
 
+target_include_directories(geometry PUBLIC
+                            "${CMAKE_CURRENT_SOURCE_DIR}")
+
 set_target_properties( geometry PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
 set_property(TARGET geometry PROPERTY FOLDER src)
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index 22f30eb..12a894d 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -11,6 +11,7 @@ list(APPEND mesh_LIB_INCLUDES
 
 # add the library
 add_library(mesh SHARED ${mesh_LIB_INCLUDES})
+target_link_libraries(mesh core geometry)
 
 set_target_properties( mesh PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )                          
 set_property(TARGET mesh PROPERTY FOLDER src)
diff --git a/src/mesh/TriMesh.cpp b/src/mesh/TriMesh.cpp
index 2ef3c0f..c6817cf 100644
--- a/src/mesh/TriMesh.cpp
+++ b/src/mesh/TriMesh.cpp
@@ -2,7 +2,7 @@
 
 void TriMesh::populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces)
 {
-    mNodes = std::move(nodes);
-    mEdges = std::move(edges);
-    mFaces = std::move(faces);
+    //mNodes = std::move(nodes);
+    //mEdges = std::move(edges);
+    //mFaces = std::move(faces);
 }
diff --git a/src/mesh/TriMesh.h b/src/mesh/TriMesh.h
index 40ed821..5d19d1a 100644
--- a/src/mesh/TriMesh.h
+++ b/src/mesh/TriMesh.h
@@ -22,7 +22,7 @@ class TriMesh
     void populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces);
 
 private:
-    std::vector<std::unique_ptr<Node> > mNodes;
-    std::vector<std::unique_ptr<Edge> > mEdges;
-    std::vector<std::unique_ptr<TriFace> > mFaces;
+    VecNodes mNodes;
+    VecEdges mEdges;
+    VecFaces mFaces;
 };