radical changes to database_interface.h