commit before I go ape shit on this buffer code