Storage/memory TODO, changes, refactoring
UnionVariant progress