[aat] Fix up previous commit and add files
4 files changed