Adding more functionality to the hunt