App working, tidying to do