Add capabilities for handling user input and identifying check
Merge fix