Buffers and events implementation

Buffers and new events implementation