Sorry this is so hard to read

A consequence of Zen copying from the Hoff board to the Rant board. We're working against two c&p's there, which makes it darn confusing. If we've got time, we'll try to clean it up more to make it more readable.