Revert "Revert "Simple HookShot update""

This reverts commit a936386159829302bffef841b648c61e27ade689.