lots of old work, plus inclusion of wave 3
Merge branch 'master' of https://github.com/bquast/South-Africa