Updated to fix web output. Next up is returning JSON instead