Buffer implementation for makedrive

I did removed and forgot to push this up haha. Good catch!