Unsuccessful attempts to handle comments. Updated TODO.