Merge code with a massaged c4l resolution protocol. #3