WIP - Snapshot of Moving to Client Model.