wip aapi request builder update