Buffer implementation for makedrive

We're going to rip this off in next patch, so should I do it right now?