first stab at completing msg management