A partial reworking of AAM section.
Merge branch 'master' of github.com:dvanhorn/aac