Fix message listeners
Restructure classes
Add data channels