Rearchitected the app