- Grouping implemented
- Cache implemented (might need reviews though)