Add client/server moving internals.