more comments. more todos