Further work to setup api client, particularly the iterator classes.