[WIP][POC] Refactor datagrid stuff

| Q                    | A
| -------------------- | ---
| Bug fix?             |
| New feature?         |
| BC breaks?           |
| CI currently passes? |
| Tests pass?          |
| Scenarios pass?      |
| Checkstyle issues?   |
| Changelog updated?   |
| Fixed tickets        |
| Doc PR               |
Be carefull with line length. Seems more than 120 chars