Feature/29/general reports