5/23/14: Started on the buffers