app done ,main UT done, to be merge to erik's code