Fleshed out some heuristics

More to come later