Delegate logic from client to server
Couple of fixes