Adding user's input validation
Updating TODO