Finish intial app rework