Replace #4

This replaces #4 on your branch, and https://github.com/JFKingsley/CharityWatcher/pull/2