beginning to redo with popup