Don't forget to switch the visiblity monitor implementation to handle these new nested thumbanils. The existing one won't work with this new hierarchy.