Adding a working buffer, hopefully... I should test before doing such things

adresses #1 and #3 issues