Added a rate limiter, still needs specs