Update to use homeshick properly