consolidating apps-WIP