ART-686 - Initial AP implementation