Attempting to add modal popups
Attempting to merge