Added final functions, app complete