Add issue 25 to TODO