WIP refactoring, report structure and main parts started but still a WIP