almost done the app