WIP progress on cascading embargo types