add todos from last discussion
more todos