finish AR queries rough draft
reshuffle naming and locations