DB Updates

Initial changes to the DB.class.