Added channel and user objects ... gonna use them later
commit to master!