Working on lsp.
Merge branch 'lsp-network' into demo