#38 Finished the change over to rawQuery tested

Note: lightly tested (doesn't crash) I also cleaned up CRUD some to make
log tags cleaner. All the original functions still exist right above the
rawQuery()'s just commented out.