More work on Spawn Client