Bug #240: Functionally complete, but need to fix the dialog appearance. 90%