Moved todos into better todo list management