Adds bucketing to checks.
Merge pull request #1 from hassox/bucket-checks

Adds bucketing to checks.