Comment out in progress code in case-parsing
Add verify_input