Almost done with mobile implementation