Nat Goodspeed: Reimplement waiting_queue;  Simplify fifo