Extension to my previous commit although this time I have restructured the Channel Listener in the server side plugin. Also starting to cleanup Channel Sender.