#16: Get started on client-side buffering