Feature/single channel

@DWvanGeest please review. Let me know when you review the previous PR and I can update this one.