Fleshed out more of the AFI code