cc @rough-minister-58256 on the hanging stuff above. Looks like you've been working on that part of the codebase recently