Client/server tracking

Follow