Overhaul of entire app