Refactor solo root to be passed around