Yeah, this is a good one. One of the final disruptive bugs I need to fix before things are smooth enough for me to take a break.