Ae fn functionality

review @tleach cc @nrschultz 
Would be really nice to maintain the single sample document, for a couple of reasons. One is just maintainability. The other is I think there is value in having a sample schema/doc which makes use of all the various features at the same time, to catch instances where a change in one feature breaks another.

Can we not work these new concepts into it? I can give you some ideas if you need them...