Work In Progress on new_hunt functionality, just needs a few more tests