adding todos works
simplified everything