rewrote (basic, extra) database and commented out old code