working on enforcing required fields