Adding tests, adding LOTS of reporting.