Started implementation of buffers