First working version on the phone
Solving some conflict from previous pull