WIP group hierarchy in storage; who knows if any of it works yet