newest working commit
working version on the phone