Revert "Revert "Them boxes and whatnot""

This reverts commit 1a65c199608641699cf4b2c68dd75e15c1a2b13c.