added msg and queue. But not building them correctly.