finished first part of app