Update to simpler push-to-pull and implement more hydrate