Bit more work on buffering: almost completely done...