More todos, and real issue links.