Add reports and begin refactoring against them