WIP - use naive counts for some tables