AIN_EF integration hopefully complete.  Atleast for now...