More tweaks, basic visibility should be functional.
More tweaks, basic visibility should be functional.