Adding minimal validation as well as error handling and display