[987797] Moved functionality over to the server