WIP
WIP
Unlayered visibility fix.
Minor migration update to clean up data.
Cleanup - WIP