Next week I dig up that branch and see if that buffer code can be used here in some way. (I will need that buffer anyway)