This can be used in a later PR to optimise our database usage significantly. Avoiding COUNT will be fantastic for our CPU usage, and therefore sync times.
