Completed the app :)