Checkpoint: pulling the server dist together