backup
code cleaned up & placed within class
Merge branch 'master' of https://github.com/UoA-eResearch/cer_swait

temp