staged for channel half of TS integration
Merge pull request #26 from DonoA/TS-full-integration

staged for channel half of TS integration