Limit channels

Opening pull request so it's easier to review
@zimbatm