Need to fix visibility

Work through the number of vision changes