P.Clarke 20141210 Initial commit of AFN replacement classes