some work on the api classes