Ae fn functionality

review @tleach cc @nrschultz 
yes, this does make it slightly simpler.  Will adjust.