diff --git a/.gitignore b/.gitignore
index 00b34e444e0f477bc77fcb8bac8cbd6e8da3fdb1..56a89b0ed85ad17d78ebd0ad367ffbffa3e8c682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build/
 Makefile
 bin/
 ui_*
+.idea/
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 5bf9e8851cb9cd26c92ce2c42c0fa4b711b48fdd..0000000000000000000000000000000000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jupedsim.iml" filepath="$PROJECT_DIR$/.idea/jupedsim.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69f0f4988f53e1c5c3bbd5eb379bfe4d090c2ddb..80628b59f30806cb1a5db3a8f41cd5b5a8408f66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,9 @@ set( SRCS
     src/jpsconnection.cpp
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
+    src/UndoFramework/action.cpp
+    src/UndoFramework/actionstack.cpp
+    src/UndoFramework/lineaction.cpp
   )  
 # all header files that should be treated with moc
 set( HDR
@@ -139,6 +142,9 @@ set( HDR
     dxflib/src/dl_creationadapter.h
     dxflib/src/dl_codes.h
     dxflib/src/dl_attributes.h
+    src/UndoFramework/action.h
+    src/UndoFramework/actionstack.h
+    src/UndoFramework/lineaction.h
  
   )