WIP on making buffers work
Fixed merge