diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..9a6705c4840e57d3c7940289be5e498ad0fcce15
--- /dev/null
+++ b/cmake/FindSphinx.cmake
@@ -0,0 +1,11 @@
+# Look for an executable called sphinx-build
+find_program (SPHINX_EXECUTABLE
+              NAMES sphinx-build
+              DOC "Path to sphinx-build executable")
+
+include (FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args (Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)
diff --git a/corsika/setup/SetupTrajectory.hpp b/corsika/setup/SetupTrajectory.hpp
index c40351d26f1c7bdef9d9b8ac18d3653caaf1927d..8d8dd92bdb92a9c4ba4a5975eb74d36ff7cae8ba 100644
--- a/corsika/setup/SetupTrajectory.hpp
+++ b/corsika/setup/SetupTrajectory.hpp
@@ -38,15 +38,15 @@ namespace corsika::setup {
      The default tracking algorithm.
    */
 
-  // typedef corsika::tracking_leapfrog_curved::Tracking Tracking;
+  typedef corsika::tracking_leapfrog_curved::Tracking Tracking;
   // typedef corsika::tracking_leapfrog_straight::Tracking Tracking;
-  typedef corsika::tracking_line::Tracking Tracking;
+  //typedef corsika::tracking_line::Tracking Tracking;
 
   /**
    The default trajectory.
   */
   /// definition of Trajectory base class, to be used in tracking and cascades
-  typedef StraightTrajectory Trajectory;
-  // typedef corsika::LeapFrogTrajectory Trajectory;
+  //typedef StraightTrajectory Trajectory;
+  typedef corsika::LeapFrogTrajectory Trajectory;
 
 } // namespace corsika::setup
diff --git a/documentation/conf.py b/documentation/conf.py
new file mode 100644
index 0000000000000000000000000000000000000000..4693c2bface440831cbfa98257c9d57fc9c4fa91
--- /dev/null
+++ b/documentation/conf.py
@@ -0,0 +1,6 @@
+#...
+extensions = [ "breathe" ]
+#...
+
+# Breathe Configuration
+breathe_default_project = "CORSIKA 8"
diff --git a/documentation/index.rst b/documentation/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9ce3208119454075d818fa50ef5d4d02941efdb8
--- /dev/null
+++ b/documentation/index.rst
@@ -0,0 +1,7 @@
+…
+
+Docs
+====
+
+.. doxygenstruct:: corsika
+   :members: