Closer to working integration with mobile client