complete mvp for client-server-scoping
and move to complete