Add comments and TODO list.