Fix modals to handle doubled up showModal calls
Add these enrollment attributes
Finish dependent issue catcher