client data model and API WIP
client data model and API WIP