Finalized app

done