Rewrote bits of REST API, now it gets data from the client