Initial 2.0 code base
Channel configuration stuff
Revert Channel configuration stuff for now