WIP: Feature/cb1 better reports