Cleaned up Route code
Small Fix
Small Fix
Merge remote-tracking branch 'gmanricks/refactor_groups' into release-2.3.0