Added the protocol part - still incomplete but at least the merge is performed.
Nick - You can add your RF part once u have pulled it and merge once compiles if u can