Issue 1: move reporter code to separate file