diff --git a/.gitmodules b/.gitmodules
index 7aadc1f..bdbb99a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "googletest"]
 	path = external/googletest
 	url = git@github.com:google/googletest.git
+
+[submodule "units"]
+	path = external/units
+	url = git@github.com:nholthaus/units.git
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e4c866..8ee7d51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,10 +33,13 @@ include_directories(
         ${PROJECT_SOURCE_DIR}/src/Basis
         ${PROJECT_SOURCE_DIR}/src/Potential
         ${PROJECT_SOURCE_DIR}/src/Solver
+		${PROJECT_SOURCE_DIR}/src/World
+
 )
 
 # Fetch all sources, creating ${SOURCES}
 file(GLOB_RECURSE SOURCES ${SOURCE_DIR}/*.cpp)
+
 # Create ${TESTS}, using test's main.cpp instead of ${SOURCE}'s one
 set(TESTS ${SOURCES} src/Basis/Initializer.cpp src/Basis/Initializer.h)
 list(REMOVE_ITEM TESTS ${SOURCE_DIR}/main.cpp)
@@ -50,20 +53,18 @@ list(APPEND TESTS
 foreach(_source ${GOOGLETEST_SOURCES})
     set_source_files_properties(${_source} PROPERTIES GENERATED 1)
 endforeach()
+
 add_library(googletest ${GOOGLETEST_SOURCES})
 
 # Main executable
 add_executable (
     Schroedinger 
-    ${SOURCES}
-        src/Basis/Initializer.cpp src/Basis/Initializer.h)
-
+    ${SOURCES})
 
 # Test executable
 add_executable(
         unit_tests
-        ${TESTS}
-        src/Basis/Initializer.cpp src/Basis/Initializer.h)
+        ${TESTS})
 
 add_dependencies(unit_tests googletest)
 if (WIN32)
@@ -78,5 +79,3 @@ if (WIN32)
         pthread
     )
 endif()
-include(CTest)
-enable_testing()
diff --git a/external/units b/external/units
new file mode 160000
index 0000000..1477a1c
--- /dev/null
+++ b/external/units
@@ -0,0 +1 @@
+Subproject commit 1477a1c185cdb9f130f463bd7e1af9289abb1173
diff --git a/src/World/World.h b/src/World/World.h
index c4986b4..6edc170 100644
--- a/src/World/World.h
+++ b/src/World/World.h
@@ -2,7 +2,5 @@
 #define WORLD_H
 
 class World 
-{
-
-};
+{};
 #endif
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 1916382..7e1725c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,13 +7,10 @@
 int main(int argc, char **argv) {
 
 	BasisManager::Builder b = BasisManager::Builder();
-//	BasisManager manager = BasisManager::getInstance();
-
 	BasisManager::getInstance()->addBase( b.addDiscrete(0, 5, 1)
 					   .addContinuous(-5.0, 5.0, 0.01)
 					   .build()
 	);
-
 	std::vector<Base> basis = BasisManager::getInstance()->getBasisList();
 	return 0;
 }
\ No newline at end of file