cleaned up crap, getting there with AA