This time, actually does add viz handling for everything