Visibility Overhaul

Lots of other stuff too.