first phase of new alerts and confirmation modals - dirty!