Added report system
Merge