WIP, fixing problem with timestamps and adding offset to each buffer.