### Description

Mostly changing around the order of what we already had written. It
wasn't totally clear what we had written if you read it straight
through.




Closes TURBO-2235