checkpoint ...  first commit with indirect access on the client-side ... still a bit shakey