Added some heuristic stuff

Not including Debbie’s changes that she made…