adding in current state of modal, still needs some polish, but moving along