wip report refactor