Epic refactor of cluster ABC to eliminate family polymorphism madness