Combining layering TODO and main TODO