Further work on client/server-ing everything. Getting there.