First draft of app complete