Rewrite client app to use new Data api