WIP commit with some windowing