First pass at reworking the rate limiting.