WIP: Opm Reports refactor #1