re: #407 makeitstop

So many moving parts.

As I mentioned the other day, we need a giant wall chart to keep track of all the actors.