Made the project compilable again, even though I can tell the endpoint interface will suck already