Add todos, but not finished rereading everything for todos