Modified TODO
Added 'eval'