More visibility work. Still buggy.