Refactor Visibility to allow for more options
mend