started refctor on CH
started refactor
Merge pull request #1 from Carpk/master_refactor

Attempting merge from Master refactor to master.