Add tee.  Move buffer status.
Remove the horror.