Add TODO and user info