Added buffer class again, with limited usage.