Extracted more sections out of TODO: