Make Database a BasicObject

Experiment with this a while and see if more is needed