Rearchitected the app into a MVP type of paradigm