AtomDB: Atomic data for X-ray astronomy

This paper outlines some of the progress in the AtomDB project, which aims to model X-ray emission from hot, collisionally ionized plasmas. We define data formats for ionization, recombination, photo-ionization and autoionization. We discuss the inclusion of the XSTAR database in AtomDB, in particular using the photoionization data, and the progress in preparing a full non-equilibrium ionization model for use by modelers and observers.