Almost done
bringing it all up to date
Merge branch 'master' of github.com:JMarcley/RareTreatment