Re: Rough work on protocol refactoring