New flush implementation (WIP)