Worked a little on the app