Added a simple buffering strategy, still a lot to do