Add name and email, remove TODO