working on teh app