Progress on the hunting module! (Lots to do here)