Got channels working. Removed some convoluded message handler code