Got one of the functions to actually return back to the client.
Resolved merge conflicts.