Refactored to API, and web - with simple request