diff --git a/AutFn.jl b/AutFn.jl
index fcdd4c8..a195374 100644
--- a/AutFn.jl
+++ b/AutFn.jl
@@ -55,16 +55,15 @@ Moreover, due to work of Potapchik and Rapinchuk [1] every real representation o
 We need a different approach: Here we actually compute in (S)Aut(𝔽ₙ)
 =#
 
-
 include("CPUselect.jl")
 set_parallel_mthread(PARSEDARGS, workers=true)
 
-using AbstractAlgebra
-using PropertyT
-using Groups
-
-include("groups/autfreegroup.jl")
-
 include("main.jl")
 
-main(SpecialAutomorphisms, PARSEDARGS)
+G = PropertyTGroups.SpecialAutomorphismGroup(PARSEDARGS)
+
+if PARSEDARGS["nosymmetry"]
+    main(Standard, G)
+else
+    main(Symmetrize, G)
+end
diff --git a/SLn.jl b/SLn.jl
index d97fd96..143e65f 100644
--- a/SLn.jl
+++ b/SLn.jl
@@ -55,11 +55,12 @@ const PARSEDARGS = parse_commandline()
 include("CPUselect.jl")
 set_parallel_mthread(PARSEDARGS, workers=true)
 
-using PropertyT
-using Groups
-
-include("groups/speciallinear.jl")
-
 include("main.jl")
 
-main(SpecialLinear, PARSEDARGS)
+G = PropertyTGroups.SpecialLinearGroup(PARSEDARGS)
+
+if PARSEDARGS["nosymmetry"]
+    main(Standard, G)
+else
+    main(Symmetrize, G)
+end
diff --git a/main.jl b/main.jl
index 9dfb776..6852397 100644
--- a/main.jl
+++ b/main.jl
@@ -45,6 +45,24 @@ function params(Gr::PropertyTGroup)
     return radius, tol, iterations, upper_bound, warm
 end
 
+main(G::SymmetricGroup) = main(Symmetrize, G)
+
+function main(::Type{Symmetrize}, Gr::SymmetricGroup)
+
+    radius, tol, iterations, upper_bound, warm, N = params(Gr)
+
+    groupdir = "$(PropertyTGroups.name(Gr))_r$radius"
+    isdir(groupdir) || mkdir(groupdir)
+    logger = PropertyT.setup_logging(joinpath(groupdir, "$(upper_bound)"), :fulllog)
+
+    G = PropertyTGroups.group(Gr)
+    S = PropertyTGroups.generatingset(Gr)
+
+    summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S)
+
+    autS = PropertyTGroups.autS(Gr)
+    info(logger, "Symmetrising with $(autS)")
+
     solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1)
 
     # solver = Mosek.MosekSolver(
@@ -56,11 +74,54 @@ end
 
     # solver = SDPA.SDPASolver(epsilonStar=tol, epsilonDash=tol)
 
-    if !PARSEDARGS["nosymmetry"]
-        sett = Settings(name, N, G, S, autS, radius, solver, upper_bound, tol, warm, logger)
-
-        return PropertyT.check_property_T(sett)
-    else
-        return PropertyT.check_property_T(name, S, G(), solver, upper_bound, tol, radius, warm)
-    end
+    sett = Settings(groupdir, N, G, S, autS,
+        radius, solver, upper_bound, tol, warm, logger)
+    return PropertyT.check_property_T(sett)
+end
+
+function main(::Type{Standard}, Gr::SymmetricGroup)
+
+    radius, tol, iterations, upper_bound, warm, _ = params(Gr)
+
+    groupdir = "$(PropertyTGroups.name(Gr))_r$radius"
+    isdir(groupdir) || mkdir(groupdir)
+    logger = PropertyT.setup_logging(joinpath(groupdir, "$(upper_bound)"), :fulllog)
+
+    G = PropertyTGroups.group(Gr)
+    S = PropertyTGroups.generatingset(Gr)
+
+    summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S)
+
+    solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1)
+
+    return PropertyT.check_property_T(groupdir, S, G(),
+        solver, upper_bound, tol, radius, warm)
+
+end
+
+
+function main(Gr::GAPGroup)
+
+    include("FPGroups_GAP.jl")
+
+    radius, tol, iterations, upper_bound, warm = params(Gr)
+
+    groupdir = groupname(Gr)
+    isdir(groupdir) || mkdir(groupdir)
+    logger = PropertyT.setup_logging(joinpath(groupdir, "$(upper_bound)"), :fulllog)
+
+    G = PropertyTGroups.group(Gr)
+    S = PropertyTGroups.generatingset(Gr)
+
+    relations = [k*inv(v) for (k,v) in G.rels]
+    prepare_pm_delta(groupdir, GAP_groupcode(S, relations), radius)
+
+    S = unique([S; inv.(S)])
+
+    summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S)
+
+    solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1)
+
+    return PropertyT.check_property_T(groupdir, S, G(),
+        solver, upper_bound, tol, radius, warm)
 end