Rework rate limit system, closes #15