We put Version 1 of this database online as an interactive Web server in 1995. Our first version has data on atomic energy levels for some 500 spectra, transition probability data for spectra of the iron-group elements, and wavelength data for spectra of a few elements; it includes no data for many important spectra, however. Pending new critical compilations of the most need data, we are extending the database by editing and adding data from earlier NIST compilations, non-NIST compilations, and selected recent publications or unpublished material. The expanded database (Version 2) will include notably improved coverage of the first 20 elements and will also have improved versatility in both the selection and presentation of the data. Options for spectral-line data will display any desired combination of data types, including all wavelength data integrated with all transition probability data. The new version will also be available on floppy disks with a windows interface.