Worked through two more public report clients and test cases.