diff --git a/DG_Approximation.py b/DG_Approximation.py
index 44dc7458aebc1960a8da510a9b28699c84b26ab4..d21d194a918b4c43fbf8df9b94329efd5b6cfbf7 100644
--- a/DG_Approximation.py
+++ b/DG_Approximation.py
@@ -3,25 +3,30 @@
 @author: Laura C. Kühle
 
 Urgent:
-TODO: Move plotting into separate function -> Done
-TODO: Move plotting into separate rule -> Done
-TODO: Extract object initialization from DGScheme
+TODO: Extract do_initial_projection() from DGScheme
+TODO: Extract calculate_cell_average() from TCD
+TODO: Extract calculate_[...]_solution() from Plotting
+TODO: Extract plotting from TCD completely
+    (maybe give indicator which plots are required instead?)
+TODO: Contain all plotting in Plotting
+TODO: Remove use of DGScheme from ANN_Data_Generator
 TODO: Adapt TCD from Soraya
     (Dropbox->...->TEST_troubled-cell-detector->Troubled_Cell_Detector)
 TODO: Add verbose output
 TODO: Improve file naming (e.g. use '.' instead of '__')
-TODO: Force input_size for each ANN model to be stencil length
 TODO: Combine ANN workflows
-TODO: Unify use of 'length' and 'len' in naming
 TODO: Add an environment file for Snakemake
-TODO: Make all directories local variable -> Done
 
 Critical, but not urgent:
+TODO: Force input_size for each ANN model to be stencil length
+TODO: Move inverse mass matrix to basis
+TODO: Use full path for ANN model state
+TODO: Enforce abstract classes/methods (abc.ABC, abc.abstractmethod)
+TODO: Extract object initialization from DGScheme
 TODO: Use cfl_number for updating, not just time
-TODO: Adjust code to allow classes for all equations
-    (Burger, linear advection, 1D Euler)
 
 Currently not critical:
+TODO: Unify use of 'length' and 'len' in naming
 TODO: Replace loops with list comprehension if feasible
 TODO: Check whether 'projection' is always a np.array()
 TODO: Check whether all instance variables are sensible
@@ -29,9 +34,13 @@ TODO: Rename files according to standard
 TODO: Outsource scripts into separate directory
 TODO: Allow comparison between ANN training datasets
 TODO: Add a default model state
+TODO: Look into validators for variable checks
 
 Not feasible yet or doc-related:
-TODO: Double-check everything! (also with pylint, pytype, pydoc, pycodestyle)
+TODO: Adjust code to allow classes for all equations
+    (Burger, linear advection, 1D Euler)
+TODO: Double-check everything! (also with pylint, pytype, pydoc,
+    pycodestyle, pydocstyle)
 TODO: Check whether documentation style is correct
 TODO: Check whether all types in doc are correct
 TODO: Discuss adding kwargs to attributes in documentation