Issue 40, Removes the dialog dependency.