More blob rewrites; WIP - see TODO