Introduced buffers and rotation. Rotation implementation is not complete