Migrate away from buffer class to a combination of File & Streams