done with database.py FINALLY
 fixed merge conflicts
WHAT IS GOING ON