cleaned up AA, begin work on NN