This should finish AFIO, apart from minor items and Paul's stuff

Come on Jenkins!