APE6 preliminary review

I've updated this - I no longer discuss uncertainty and say that we may add it to the base class in future once we settle on an infrastructure for uncertainties.