Actuall add buffer support. Derp.