beginning refactor
updating To Do