@lanodan @emily My solution here ended up being quite hacky...
Part of what drove me to write my own!