Got heuristics working nicely