Added modal, and created validation for needed values