diff --git a/gap/OrbitalGraphs.gi b/gap/OrbitalGraphs.gi
index 9b635b0..7214856 100644
--- a/gap/OrbitalGraphs.gi
+++ b/gap/OrbitalGraphs.gi
@@ -10,7 +10,29 @@
 #   a version that only gives a representative in the isomorphism class, and
 #   a version that gives the ones actually used in backtrack?
 #
-InstallMethod(OrbitalGraphs, "for a permutation group", [IsPermGroup],
+InstallMethod(OrbitalGraphs, "for a permutation group (super basic)", [IsPermGroup],
+function(G)
+  local pts, graphs, stab, innerorbits, orb, iorb;
+
+  # Commented out lines give the behaviour of the original OrbitalGraphs method
+
+  pts := MovedPoints(G);
+  #pts := [1 .. LargestMovedPoint(G)];
+  graphs := [];
+  for orb in Orbits(G, pts) do
+    stab := Stabilizer(G, orb[1]);
+    innerorbits := Orbits(stab, MovedPoints(stab));
+    #innerorbits := Orbits(stab, Difference(pts, [orb[1]]));
+    for iorb in innerorbits do
+      AddSet(graphs, EdgeOrbitsDigraph(G, [orb[1], iorb[1]]));
+    od;
+  od;
+  return graphs;
+end);
+
+# TODO decide what to do about non-moved points
+
+InstallMethod(OrbitalGraphs, "for a permutation group (uses stab chain)", [IsPermGroup],
 function(G)
   local orb, orbitsG, iorb, graph, graphlist, val, p, i, innerorblist, orbreps,
         fillRepElts, maxval;
@@ -60,6 +82,51 @@ function(G)
   return graphlist;
 end);
 
+
+InstallMethod(OrbitalGraphs, "for a permutation group (no stab chain)", [IsPermGroup],
+function(G)
+  local n, gens, seen, reps, graphs, root, D, orbit, schreier_gens, b, schreier_gen, innerorbits, a, i, inner;
+
+  n := LargestMovedPoint(G);
+  gens := GeneratorsOfGroup(G);
+  seen := BlistList([1 .. n], []);
+  reps := [];
+  graphs := [];
+
+  repeat
+    root := First([1 .. n], x -> not seen[x]);
+    seen[root] := true;
+    reps[root] := ();
+    orbit := [root];
+    schreier_gens := [];
+
+    # Construct a basic Schreier tree for <root> and Schreier generators for stabiliser of <root>
+    for a in orbit do
+      for i in [1 .. Length(gens)] do
+        b := a ^ gens[i];
+        if not seen[b] then
+          reps[b] := reps[a] * gens[i];
+          seen[b] := true;
+          Add(orbit, b);
+        else
+          schreier_gen := reps[a] * gens[i] * reps[b] ^ -1;
+          Add(schreier_gens, schreier_gen);
+        fi;
+      od;
+    od;
+
+    # Compute the orbits of the stabilizer of <root>, and hence the orbital graphs
+    if not IsTrivial(orbit) then
+      innerorbits := Orbits(Group(schreier_gens));
+      for inner in innerorbits do
+        AddSet(graphs, EdgeOrbitsDigraph(G, [orbit[1], inner[1]]));
+      od;
+    fi;
+
+  until SizeBlist(seen) = n;
+  return graphs;
+end);
+
 InstallMethod(OrbitalClosure, "for a permutation group", [IsPermGroup],
 G -> Intersection(List(OrbitalGraphs(G), AutomorphismGroup)));
 # TODO: TwoClosure as implemented by Heiko Theißen requires the group