A lot of intermediate changes to "flags", some of them breaking.
Looking to clean up in the next couple commits.
more work on disk flags