refactoring
adding reports
adding db
refact
refact
refact