Work on splitting Todo