[CCRM-17] Working on forking

This is kind of awesome - forking + pull request