Slightly rework how requests are made on the front end