work in progress: registrationPerYearPerOutcome, more refactoring