Added connection limiter, needs tests