Start to update AAA. This gets the tests passing.

However, all the comments should be updated.
Merge pull request #15 from gsnedders/update-aaa

Update AAA.