Finishing some basic enpoints for mobile client.
fix merge conflict