Adds aa working implementation