Move som handling from Walker to client