First pass at ANA/ANI
Finished ADD, added ADI, and added some more unit tests