initial revision of wrapper api