WIP: Refactoring to get ready for allocating spill over vectors