buffer objects seem satisfied
Merge remote-tracking branch 'grey/master'
merged in greys working test