msg classes added - changed arguments so that it actually works now!