commit from work (unfinished, untested, app crasher)