refactors in preparation for multi-version protocol support
refactors in preparation for multi-version protocol support

willbryant/kitchen_sync,willbryant/kitchen_sync,willbryant/kitchen_sync,willbryant/kitchen_sync,willbryant/kitchen_sync,willbryant/kitchen_sync