Work in progress. Adding necessary dialogs