Complete 5.10: Adding Some Validation