agent has been getting a bit wonky with this PR, so adding do-not-merge in case it gets too creative