diff --git a/Snakefile b/Snakefile
index c1ebf6f3d672747a743233227926dafdc6be7a91..9a4e7911895b3eadf9025bdc537510b1230771e0 100644
--- a/Snakefile
+++ b/Snakefile
@@ -27,13 +27,15 @@ TODO: Discuss how wavelet details should be plotted
 Urgent:
 TODO: Check whether 'projection' is always a ndarray
 TODO: Check whether ghost cells are handled/set correctly
-TODO: Enforce even number of ghost cells on each side on fine mesh (?)
-TODO: Check whether all instance variables are sensible
-TODO: Combine ANN workflows if feasible
 TODO: Make sure that the cell indices are the same over all TCDs
 TODO: Make sure TCs are reported as ndarray
+TODO: Extract equation-related functionality into LinearAdvection class
+TODO: Use cfl_number for updating, not just time (equation-related?)
+TODO: Add Burger class
 
 Critical, but not urgent:
+TODO: Combine ANN workflows if feasible
+TODO: Check whether all instance variables are sensible
 TODO: Check whether all ValueError are set (correctly)
 TODO: Introduce env files for each SM rule
 TODO: Add an environment file for Snakemake
@@ -43,7 +45,10 @@ TODO: Use full path for ANN model state
 TODO: Add a default model state
 TODO: Look into validators for variable checks
 TODO: Investigate g-mesh(?)
+TODO: Enforce even number of ghost cells on each side on fine mesh (?)
 TODO: Create g-mesh with Mesh class
+TODO: Add images to report
+TODO: Add verbose output
 
 Not feasible yet or doc-related:
 TODO: Move plot_approximation_results() into plotting script
@@ -54,12 +59,9 @@ TODO: Replace pop() with get() for dictionary access
 TODO: Induce shift in IC class
 TODO: Force input_size for each ANN model to be stencil length
 TODO: Restructure directories
-TODO: Add images to report
-TODO: Add verbose output
 TODO: Adjust definitions of each IC to be dependent on domain
 TODO: Add README for ANN training
 TODO: Give detailed description of wavelet detection
-TODO: Use cfl_number for updating, not just time (equation-related?)
 TODO: Adjust code to allow classes for all equations
     (Burger, linear advection, 1D Euler)
 TODO: Add ThresholdDetector