WIP on aapi samples