Numerous changes to dbHelper - incomplete