Opm Reports refactor #2