Limit channels

Opening pull request so it's easier to review
Doesn't appear to have worked :(