Group hierarchies handled incompletely

The parts that handle group hierarchies currently one take one layer into account. They need to be made recursive.