RapidPush: Update with new channel feature

Sorry for the strange commits, forgot to pull your changes first and pushed to fast :) but should be fine.