#23 Use the combined heuristic

Although currently just adding the PieceHeuristic.