Began working on application rehaul