Work towards highlighting. Many subtle issues. Almost there.