re-working app with 1 main query