Aya adder

review and merge @amryassin