Hey John, I merged all of this except the last two commits, which I'd like to discuss a bit more. Those live in jk/collapsible-sections. I'll chime in on the other thread about that. Thanks, Jason