Some in-progress avatar work, better channel adapter state management.