Attempting to add input validation