Starting to migrate to mobileclient