WIP for in-memory expansion