More WIP on mirroring/reporting and cleanup