starting to refactor reports into classes, also refactored some more dimensions which is still not 100% working and needs more work