Finish first version of app