First parts of client-side handling complete 8/22