Uncertainties

Merging so I can work from a proper, new branch for the fun times that await me over the next two hours or so