More work on getting the ContentProvider working