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

Ok, this definitely should work now ...