Figting with GIT, merging things back, no code changes. Hooks have broken, network code doesn't work, Fix!