Major application overhaul