Figured out dynamic modal, now need to implement throughout