First attempt at receiver buffering