progress on moving over to new Buffer syntax