PART 1 DONE: Added validations