preparing to delete vast amounts of code
Merge pull request #68 from MatthewJA/pre-uncertainties

preparing to delete vast amounts of code