Rounded out the rest of the stack

Finished the rest of the rule of three. Got everything pretty much right
the first time, so I'll take that as a good sign.