Finished gift aid event supplement
refactored 1
Refactored 2