quick pass to fill in todos