Adding aj1

Pulling AJ1

CC @dohtdoh @bmatheny