Some code updates to communicate to the server, still in dev