update ToDo
unfinished refactoring