refactored reports to include weekly reports