Another big refactor and new things

Merge request reports

Loading