Finishing up detailed report impl