Finishing up the app