add TODO, give a type to the messagequeue