finished up the app for first testing round