Move more work to the client
Selve host