Minor refactor on server side. Prep for better general channel handling.