Added more infrastructure and fleshed out the concept of  channels and connections